Merge branch '97' into 99
Moving layout
Adding activity stream to layout
Updating group page
Cleaning up template
Updating group page