Wording changes to add email, fixes #6675
Slight update to db schema
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev