Merge branch 'master' into no-css-js-delivery-via-php

apps/files/ajax/delete.php

apps/files/ajax/newfile.php

apps/files/ajax/newfolder.php

apps/files/appinfo/update.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/tests/js/fileactionsSpec.js

apps/files/tests/js/filelistSpec.js

apps/files_encryption/lib/helper.php

apps/files_external/lib/google.php

apps/files_external/lib/streamwrapper.php

apps/files_external/lib/webdav.php

apps/files_external/tests/config.php

apps/files_external/tests/webdav.php

apps/files_sharing/js/public.js

apps/files_sharing/lib/cache.php

apps/files_sharing/lib/sharedstorage.php

apps/files_trashbin/ajax/delete.php

apps/files_trashbin/ajax/undelete.php

apps/files_trashbin/js/trash.js