fixes #7448 fix contact ID; cleanup old code
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev