Merge remote-tracking branch 'mghilaci/feature/newgroups' into feature/newgroups
relink correct html template (need work)
Merge remote-tracking branch 'upstream/feature/newgroups' into feature/newgroups
Fix buttons on group list page