Allowing groups to come through as a full property of user.
Merge branch 'master' of http://github.com/punkave/apostrophe-groups
Merge branch 'master' of http://github.com/punkave/apostrophe-groups
Resolving some file conflicts