Formatting
Formatting
Cleanup/rationalisation
Merge branch 'master' into portal_integration

Conflicts:
	modules/core/app/rest/SearchDAO.scala
Merge branch 'portal_integration' of github.com:mikesname/docview into portal_integration