修复登录无法显示用户信息的问题
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	client/main.coffee