fix email markup
fix template loader for job queue's emailer.
Merge branch 'master' into js-dsc667
Merge pull request #649 from nla/js-dsc667

Js dsc667