Merge branch 'master' into storagestatistics-reuse

README.md

apps/files/ajax/upload.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files_encryption/hooks/hooks.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/hooks.php

apps/files_encryption/tests/keymanager.php

apps/files_encryption/tests/proxy.php

apps/files_encryption/tests/share.php

apps/files_sharing/lib/cache.php

apps/files_sharing/lib/share/file.php

apps/files_sharing/public.php

apps/files_sharing/tests/cache.php

apps/user_ldap/appinfo/info.xml

apps/user_ldap/js/settings.js

apps/user_ldap/lib/access.php