merge master with resolved conflicts

apps/files/index.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/ru_RU.php

apps/files/l10n/sk_SK.php

apps/files/templates/index.php

apps/files_encryption/hooks/hooks.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/sv.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/util.php

apps/files_sharing/appinfo/app.php

apps/files_sharing/css/public.css

apps/files_sharing/js/public.js

apps/files_sharing/l10n/pt_PT.php

apps/files_sharing/l10n/ru_RU.php

apps/files_sharing/l10n/sv.php