Merge branch 'master' into oc_avatars

apps/files/ajax/rawlist.php

apps/files/css/files.css

apps/files/js/file-upload.js

apps/files/l10n/ca.php

apps/files/l10n/es.php

apps/files/l10n/es_AR.php

apps/files/l10n/et_EE.php

apps/files/l10n/fr.php

apps/files/l10n/gl.php

apps/files/l10n/ku_IQ.php

apps/files/l10n/nl.php

apps/files/l10n/nn_NO.php

apps/files/l10n/pl.php

apps/files/l10n/pt_BR.php

apps/files/l10n/ro.php

apps/files/l10n/sq.php

apps/files/l10n/uk.php

apps/files_encryption/l10n/es.php

apps/files_encryption/l10n/es_AR.php

apps/files_encryption/l10n/fi_FI.php