Merge branch 'master' into fix_4258

3rdparty

apps/files/ajax/newfile.php

apps/files/css/files.css

apps/files/index.php

apps/files/js/file-upload.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/templates/index.php

apps/files/templates/part.list.php

apps/files_sharing/ajax/publicpreview.php

apps/files_sharing/appinfo/routes.php

apps/files_sharing/js/public.js

apps/files_sharing/public.php

apps/files_sharing/templates/public.php

apps/files_trashbin/ajax/preview.php

apps/files_trashbin/appinfo/routes.php

apps/files_trashbin/index.php

apps/files_trashbin/lib/trash.php

apps/files_trashbin/templates/part.list.php

config/config.sample.php