Merge branch 'development' of https://github.com/RichmondDay/www.mini.ca into development
fix dag
added CEM to all forms
Merge branch 'development' of https://github.com/RichmondDay/www.mini.ca into development
Merge pull request #844 from tonyrd/development

added CEM to all forms + updated on-screen & emailers