changes for some integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	emailCampaign/views/CreateEmail.ejs