Merge branch 'master' into moviepreviewfallback

apps/files/ajax/list.php

apps/files/index.php

apps/files/js/file-upload.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/pt_BR.php

apps/files/l10n/ru_RU.php

apps/files/l10n/uz.php

apps/files_encryption/l10n/pt_BR.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/helper.php

apps/files_encryption/tests/keymanager.php

apps/files_external/css/settings.css

apps/files_sharing/lib/sharedstorage.php

apps/files_sharing/lib/watcher.php

apps/files_sharing/tests/api.php

apps/files_sharing/tests/base.php