Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename

apps/files/index.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/templates/index.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/util.php

apps/files_sharing/templates/public.php

lib/private/api.php

lib/private/app.php

lib/private/appframework/dependencyinjection/dicontainer.php

lib/private/appframework/http.php

lib/private/appframework/http/dispatcher.php

lib/private/appframework/http/redirectresponse.php

...e/appframework/middleware/security/securitymiddleware.php

lib/private/connector/sabre/file.php

lib/private/connector/sabre/node.php

lib/private/connector/sabre/objecttree.php

lib/private/db/mdb2schemamanager.php

lib/public/appframework/http.php