added ability to edit groups
added ability to edit groups
Merge branch 'edit-groups'