Merge branch 'master' into fixing-windows-datadir-master

.gitignore

.gitmodules

3rdparty

apps/files/ajax/upload.php

apps/files/js/fileactions.js

apps/files/l10n/ar.php

apps/files/l10n/el.php

apps/files/l10n/es_AR.php

apps/files/l10n/fa.php

apps/files/l10n/fr.php

apps/files/l10n/tr.php

apps/files/l10n/zh_CN.php

apps/files/l10n/zh_HK.php

apps/files/templates/index.php

apps/files_encryption/l10n/ar.php

apps/files_encryption/l10n/fa.php

apps/files_encryption/l10n/sl.php

apps/files_encryption/l10n/zh_CN.php

apps/files_encryption/l10n/zh_HK.php

apps/files_external/l10n/fa.php