Correcting merge problems
First draft for the add group page
Merge branch 'master' of https://github.com/FairCounts/FairCounts-app
Add Group done