Fix access control on new portal controllers
Merge branch 'master' into user_messages

Conflicts:
	modules/portal/app/controllers/portal/Social.scala