Brought in the documentviewer

Relies on https://github.com/sakaiproject/Hilary/pull/359