improved group management system. waiting for whiteboard improvements.
Merge branch 'group-management'