login页面优化
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	client/login.html
显示错误信息
登录按钮不可点
Merge branch 'master' of https://github.com/bigzhu/shuqian
google 登录不显示修改密码按钮