added group styles, browse groups button
fixed coflicts in user's controller
Merge branch 'MyGroupsStyles'

fixed merge conflicts in the user's controller.