Updated email address for all templates with correct
Merge branch 'Mandrill' into dev-260714-0525

Conflicts:
	web/composer.json