Update the WDN email Template
Add and use a template for emails
Merge remote-tracking branch 'upstream/master'