Added references to group into user model, completed skeleton for controller
Merge master to branch
Merge branch 'master' into group-controller
updating group controller to last master
resolve conflicts