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
Merge branch 'master' into dao_exceptions

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