Merge branch 'master' into fix_for_2377

.gitignore

apps/files/l10n/el.php

apps/files/l10n/ru_RU.php

apps/files/l10n/sk_SK.php

apps/files/l10n/tr.php

apps/files/templates/part.breadcrumb.php

apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php

...ncryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.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/appinfo/database.xml

apps/files_encryption/appinfo/info.xml

apps/files_encryption/appinfo/spec.txt

apps/files_encryption/css/settings-personal.css

apps/files_encryption/hooks/hooks.php

apps/files_encryption/js/settings-admin.js

apps/files_encryption/js/settings-personal.js

apps/files_encryption/js/settings.js