Merge branch 'master' into fixing-appframework-master

apps/files/css/files.css

apps/files/js/file-upload.js

apps/files/js/fileactions.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/ady.php

apps/files/l10n/ar.php

apps/files/l10n/da.php

apps/files/l10n/de.php

apps/files/l10n/de_DE.php

apps/files/l10n/es.php

apps/files/l10n/et_EE.php

apps/files/l10n/eu.php

apps/files/l10n/gl.php

apps/files/l10n/it.php

apps/files/l10n/lt_LT.php

apps/files/l10n/pt_BR.php

apps/files/l10n/zh_TW.php

apps/files/templates/index.php

apps/files_encryption/l10n/ca.php