add option if no groups are there
Merge branch 'people_groups' into testing