refs #7803 alter folder paths
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev