Update Action Logger DAO
Update social activity stream action and manager
Merge branch 'master' into groups_and_roles_together