Checked in the changes related to MailUtility & KillSwitch properties
Merge branch 'master' of https://github.com/numora/Grievance-Portal

Conflicts:
	src/main/resources/META-INF/config/tiles-portal-defs.xml