Small fixes/changes
Merge remote-tracking branch 'origin/node-mailer' into node-mailer

Conflicts:
	email.js
	emailtemplates/invite_html.handlebars