Adding and modifying email submission template
Merge branch 'master' into test