merge in people groups
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge branch 'doctran' into testing
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge pull request #328 from sharewave/master

merge master to testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge branch 'doctran' into testing
Merge branch 'doctran' into testing
Merge branch 'people_groups' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing
Merge branch 'people_groups' into testing
Merge branch 'people_groups' into testing
Merge branch 'master' into testing