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
Merge branch 'play22_object_actions_auth_controller' into dao_exceptions
Merge upstream changes, renaming listAction to pageAction and adding a true listAction
Remove dup dep