Some integration changes. With the already written code for emails, templates etc
Merge remote-tracking branch 'origin/master'

Conflicts:
	emailCampaign/views/templates.ejs