修改判断方式，google的话 本地user是undefined
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	client/main.coffee
Merge branch 'master' of https://github.com/bigzhu/shuqian