Removed underscore from the shared mimetypes utility
Update the preferences test
Fix for XSS issue in following notifications
Merge pull request #3791 from simong/xss-following

Fix for XSS issue in following notifications
Email translation follow-up
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into emailI18N
Reverted back to `ACTIVITY_` keys
Removed trailing comma
Merge pull request #3793 from nicolaasmatthijs/emailI18N

Email i18n improvements
(Issue 3794) Embed previews mimetypes in maintenance.js
Synchronized translations
Merge branch 'testFix' of https://github.com/bp323/3akai-ux into testFix

Conflicts:
	tests/qunit/js/util.js
(Issue 3794) Revert something in qunit
Merge pull request #3794 from mrvisser/issue-3794

Maintenance widget does not work on optimized build