updates, refs #7660, refs #7797
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev