Put a placeholder page in place till the portal is further along
Fix missing route after merge with master
Cache placeholder - cus we're gonna get lots of hits, right?
Merge branch 'master' into portal_integration

Conflicts:
	modules/portal/app/controllers/Portal.scala
	modules/portal/conf/portal.routes
Simplify placeholder
Merge branch 'master' into portal_integration
Various fixes to redirect urls (remove hardcoding...), shuffle default login method.
Merge branch 'master' into portal_integration
Fix deserved brokeness in linker app
Merge branch 'master' into portal_integration