ui and node integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	emailCampaign/views/emails.ejs