node-mailer support.
Merge branch 'master' of github.com:aspectron/zetta-app

Conflicts:
	package.json