Merge pull request #1 from mfc/master

Sounds good!
Templating the report form
Templates update #2
adding report email template