Add a (slightly nasty) method of signalling the DB is offline for maintenance
Add server side templates for portal dev
Don't do a DB query if there are not items to retrieve
Remove errant @
Log fetching annotations
Merge branch 'master' into portal_integration

Conflicts:
	modules/portal/app/controllers/Portal.scala