whitespace change
Merge branch 'master' into design
moved email template
Merge branch 'master' into design