basic email is working..
Merge branch 'email' into modules

Conflicts:
	email/email.js