Created relationship with user and groups
Hello
Merge remote-tracking branch 'Enrique/master'
Half way through hacking the like button
Merge remote-tracking branch 'matt/master'
Matt and my updates for the weekend