Merge branch 'master' into appframework-master

apps/files/js/file-upload.js

apps/files/templates/index.php

apps/files_encryption/l10n/uk.php

apps/files_sharing/js/public.js

apps/user_webdavauth/l10n/uk.php

core/l10n/ca.php

core/l10n/cs_CZ.php

core/l10n/da.php

core/l10n/de.php

core/l10n/de_CH.php

core/l10n/de_DE.php

core/l10n/el.php

core/l10n/en_GB.php

core/l10n/es.php

core/l10n/es_AR.php

core/l10n/et_EE.php

core/l10n/eu.php

core/l10n/fa.php

core/l10n/fr.php

core/l10n/gl.php