templates
final UI changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	emailCampaign/views/templates.ejs