fixes #7800 inline edit suppress processing... text for button submit
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
fixes #7806 email content missing from approver email
fixes #7748 condition subject search on activity type id
Merge branch 'dev' into test