#682: Update Group queryset lists on add/edit forms to only display proper groups to user
Merge with master
#682: Removing whitespace
Merge branch 'master' into bixly-testing