Merge branch 'master' into user

apps/files/l10n/pt_PT.php

apps/files_encryption/ajax/adminrecovery.php

apps/files_encryption/ajax/changeRecoveryPassword.php

apps/files_encryption/ajax/userrecovery.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/et_EE.php

apps/files_encryption/l10n/gl.php

apps/files_encryption/l10n/it.php

apps/files_encryption/l10n/ja_JP.php

apps/files_encryption/l10n/nl.php

apps/files_encryption/l10n/pl.php

apps/files_encryption/l10n/pt_BR.php

apps/files_encryption/l10n/pt_PT.php

apps/files_encryption/l10n/ru.php

apps/files_encryption/l10n/sk_SK.php

apps/files_encryption/l10n/zh_TW.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php