Tidyups and insertion of (fake)user into timeout error message
Merge branch 'master' of github.com:mikesname/docview

Conflicts:
	app/controllers/base/AuthController.scala