Merge branch 'hotfix/noreversematch'
enhanced emailed notification templates
Merge branch 'hotfix/mail-template' into develop
Merge pull request #125 from SimonSarazin/develop

Hotfix test new template