refs #7346 adjust how approval is handled
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev