fix local login bug
Merge branch 'master' of github.com:liuzenan/wowcheer

Conflicts:
	app/models/auth.js