Only show childCount if there are actually child items.
More portal templating and search fixes
Tweaks to the landing page
More mucking with the horrible (and still crap) landing page
More portal template scaffolding
Renamed listAction to pageAction since that's what it actually does
Merge branch 'master' into play22_object_actions_auth_controller

Conflicts:
	modules/core/app/controllers/base/EntityRead.scala
	modules/portal/app/controllers/Portal.scala
Update to 2.2.1-RC1 (and add mysterious sbt voodoo fix