Merge remote-tracking branch 'origin/master' into email-verification

config/app.php

@@ -229,7 +229,7 @@ return [
         'Image' => Intervention\Image\Facades\Image::class,
         'Stripe' => Cartalyst\Stripe\Laravel\Facades\Stripe::class,
         'Crawler' => Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect::class,
-        'Madzipper' => Madnest\Madzipper\Madzipper::class,
+        //'Madzipper' => Madnest\Madzipper\Madzipper::class,
     ],
 
     'deploy_secret' => env('APP_DEPLOY_SECRET'),

config/language-translations.php

@@ -577,6 +577,7 @@ return [
         'shared_form.recipients_label' => 'Recipients',
         'shared_form.share_by_email' => 'Share by Email',
         'shared_form.share_by_link' => 'Share by Link',
+        'sidebar.sharing' => 'Sharing',
         'sidebar.favourites' => 'Favourites',
         'sidebar.favourites_empty' => 'Drag here your favourite folder.',
         'sidebar.folders_empty' => 'Create some new folder.',