merge master into filesystem

README

apps/files/appinfo/update.php

apps/files/js/fileactions.js

apps/files/js/files.js

apps/files/l10n/pl.php

apps/files/l10n/pt_PT.php

apps/files/l10n/ta_LK.php

apps/files_encryption/lib/proxy.php

apps/files_external/lib/config.php

apps/files_external/lib/ftp.php

apps/files_external/lib/smb.php

apps/files_external/lib/swift.php

apps/files_external/lib/webdav.php

apps/files_external/tests/ftp.php

apps/files_sharing/public.php

apps/files_versions/lib/versions.php

apps/user_ldap/lib/access.php

apps/user_ldap/lib/connection.php

apps/user_ldap/templates/settings.php

apps/user_ldap/user_ldap.php