delete group stuff
fix up delete groups so this works now
Merge branch 'groupdelete' into devbranch-dhiller