updates, refs #7660, refs #7797
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
better error checking, fixes #7660
better error clearing, fixes #7754
Merge branch 'dev' into test