Merged together groups and groups_administration
Moved groups tests
Merge branch 'groups-refactoring'