Merge branch 'master' into trash_bin_delete_selected

apps/files/ajax/upload.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/nl.php

apps/files/l10n/pl.php

apps/files_external/lib/amazons3.php

apps/files_external/lib/sftp.php

apps/files_external/lib/streamwrapper.php

apps/files_external/lib/swift.php

apps/files_external/lib/webdav.php

apps/files_trashbin/js/trash.js

apps/files_trashbin/l10n/uk.php

apps/files_versions/appinfo/app.php

apps/files_versions/js/versions.js

apps/files_versions/l10n/uk.php

apps/files_versions/lib/hooks.php

apps/files_versions/lib/versions.php

core/css/styles.css

core/img/filetypes/application-msexcel.png

core/img/filetypes/application-mspowerpoint.png