integration of ejs files started
Merge remote-tracking branch 'origin/master'

Conflicts:
	emailCampaign/views/Landing.ejs