small changes
Merge branch 'people_groups' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing