Temporary XSS fixes
Merge pull request #2784 from nicolaasmatthijs/XSS

Temporary XSS fixes
Additional admin UI fixes after hosts fix
Merge pull request #2785 from nicolaasmatthijs/adminUI

Additional admin UI fixes after hosts fix
Merge branch 'newframework' of github.com:sakaiproject/3akai-ux into newframework