config email
Merge branch 'master' of github.com:liuzenan/wowcheer

Conflicts:
	app/controllers/email.js
fix various bug