fixes #6102 change group display on contact edit
fixes #6987 email counts in district stats
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev