Fixed content preview
Merge branch 'newframework' of github.com:sakaiproject/3akai-ux into newframework