refs #5581 use pubfiles url
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
fixes #7785, refs #2812 - allow no header/footer
fixes #7749 mailing categories
Merge branch 'dev' into test