MailTemplateService
Backend for sending mail done.
Fixed merge errors