Merge branch '2.2' into 2.3

# Conflicts:
#	composer.lock

resources/assets/sass/app.scss

@@ -9,6 +9,9 @@ html {
     position: relative;
     min-height: 100%;
     -webkit-font-smoothing: antialiased;
+    // always show up-down scrollbar to prevent content from jumping left/right
+    // depending on whether the page is taller than 100% of viewport height
+    overflow-y: scroll;
 }
 
 body {

resources/views/dashboard/settings/localization.blade.php

@@ -64,9 +64,9 @@
                                         <label>{{ trans('forms.settings.localization.site-locale') }}</label>
                                         <select name="app_locale" class="form-control" required>
                                             <option value="">Select Language</option>
-                                            @foreach($langs as $lang => $name)
-                                                <option value="{{ $lang }}" @if($app_locale === $lang) selected @endif>
-                                                    {{ $name }}
+                                            @foreach($langs as $key => $lang)
+                                                <option value="{{ $key }}" @if($app_locale === $key) selected @endif>
+                                                    {{ $lang['name'] }}
                                                 </option>
                                             @endforeach
                                         </select>