ajaxian work for #6957
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
final work, fixes #6957