Tweaks to solr script
Put a placeholder page in place till the portal is further along
Merge branch 'master' into portal_dev

Conflicts:
	modules/portal/app/views/portal.scala.html
Merge branch 'portal_dev' of github.com:mikesname/docview into portal_dev

Conflicts:
	modules/portal/app/views/portal.scala.html
Fix references to portal controller
Cache placeholder - cus we're gonna get lots of hits, right?
Simplify placeholder
Merge branch 'master' into portal_dev
Various fixes to redirect urls (remove hardcoding...), shuffle default login method.
Merge branch 'master' into portal_dev
Fix deserved brokeness in linker app
Merge branch 'master' into portal_dev