Merge branch 'master' into oc_api_tests

apps/files/js/filelist.js

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/user_ldap/css/settings.css

apps/user_ldap/js/settings.js

apps/user_ldap/lib/wizard.php

apps/user_ldap/templates/part.wizard-server.php

apps/user_ldap/templates/settings.php

lib/private/connector/sabre/file.php

lib/private/files/cache/homecache.php

lib/private/files/filesystem.php

lib/private/files/storage/common.php

lib/private/files/storage/home.php

settings/css/settings.css