email node
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/model/user.js
Merge remote-tracking branch 'origin/master'
email node