Merge branch 'dev' into getmail
new message template
Merge pull request #36 from CanvasApp/getmail

Getmail