coding #26 fixing test
Merge remote-tracking branch 'origin/feature/26' into feature/39
coding #39 integrating model with mail template