update images and email templates
Merge branch 'master' into stage