fixes #7116 merge menu permission
fixes #7111 website save
refs #6845 exclude test jobs from queries
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
custom activity status for inbound emails, fixes #6927
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev

* 'dev' of github.com:nysenate/Bluebird-CRM:
  refs #6845 exclude test jobs from queries
  fixes #7111 website save
  fixes #7116 merge menu permission
added BB_NORMALIZE to search queries, fixes #6374
custom activity status for inbound emails on match, fixes #6927
refs #6845 addional mailing_job query
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
Merge branch 'dev' into test