Merge remote-tracking branch 'origin/folders_upload' into folder_upload_v2

# Conflicts:
#	composer.lock
#	config/language-translations.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/DesktopToolbar.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js
#	src/Domain/Files/Actions/UploadFileAction.php
#	src/Domain/Files/Requests/UploadRequest.php
#	tests/Domain/Admin/AdminTest.php
#	tests/Domain/Files/FileTest.php
#	tests/Domain/Folders/FolderTest.php
#	tests/Domain/Sharing/VisitorManipulatingTest.php
#	tests/Domain/Traffic/TrafficTest.php
#	tests/Domain/Trash/TrashTest.php
#	tests/Domain/Zip/UserZippingTest.php

resources/js/store/modules/fileFunctions.js

@@ -152,7 +152,7 @@ const actions = {
             })
             .catch(() => Vue.prototype.$isSomethingWrong())
     },
-    uploadFiles: ({commit, getters}, {form, fileSize, totalUploadedSize}) => {
+    uploadFiles: ({commit, getters, dispatch}, {form, fileSize, totalUploadedSize}) => {
         return new Promise((resolve, reject) => {
 
             // Get route
@@ -210,8 +210,12 @@ const actions = {
                         }
 
                         // Reset upload process
-                        if (!getters.fileQueue.length)
+                        if (!getters.fileQueue.length) {
                             commit('CLEAR_UPLOAD_PROGRESS')
+
+                            // Reload files after upload is done
+                            dispatch('getFolder', [{folder: getters.currentFolder, back: true, init: false}])
+                        }
                     }
                 })
                 .catch(error => {