Newsfeed now only shows activity for the groups the current user is in
Resolved merge conflict