US638
US638
US638 Notification email
Merge branch 'email' into development

Conflicts:
	c3/conf/application.conf
	c3/conf/cy/headingsAndTitles.cy.properties
	c3/conf/cy/preview.cy.properties
	c3/conf/en/headingsAndTitles.en.properties