merge master into filesystem

apps/files/l10n/el.php

apps/files/l10n/eo.php

apps/files/l10n/gl.php

apps/files/l10n/pt_BR.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/cryptstream.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/settings.php

apps/files_encryption/templates/settings.php

apps/files_encryption/tests/proxy.php

apps/files_encryption/tests/stream.php

apps/files_external/ajax/addMountPoint.php

apps/files_external/ajax/addRootCertificate.php

apps/files_external/ajax/dropbox.php

apps/files_external/ajax/google.php

apps/files_external/js/settings.js

apps/files_external/lib/amazons3.php

apps/files_external/lib/config.php

apps/files_external/lib/dropbox.php