Merge branch 'groups'
Merge branch 'master' of github.com:sharewave/frontus
Merge branch 'master' into people_overhaul

Conflicts:
	cmn/partials/peopleFilter.html
Merge branch 'people_overhaul' into testing

Conflicts:
	cmn/partials/peopleFilter.html