更新

1.用户信息更新bug修改
2.新添加了前台验证码
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	src/struts.xml
更新