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