merge master into filesystem

apps/files/ajax/upload.php

apps/files/index.php

apps/files/l10n/cs_CZ.php

apps/files/l10n/ja_JP.php

apps/files/l10n/ka_GE.php

apps/files/l10n/lt_LT.php

apps/files/l10n/ru_RU.php

apps/files/l10n/sk_SK.php

apps/files/l10n/ta_LK.php

apps/files/l10n/zh_CN.php

apps/files_encryption/l10n/sl.php

apps/files_encryption/l10n/uk.php

apps/files_external/l10n/lt_LT.php

apps/files_external/l10n/ru.php

apps/files_external/l10n/si_LK.php

apps/files_external/lib/config.php

apps/files_sharing/l10n/ja_JP.php

apps/files_sharing/l10n/si_LK.php

apps/files_sharing/l10n/sl.php

apps/files_sharing/lib/sharedstorage.php