email template
Merge branch 'full-view-css' of https://github.com/AnyFetch/salesFetch into full-view-css

Conflicts:
	app/templates/email.json