改动验证码属性名
Merge branch 'master' of https://github.com/OpenWin/Walemao

Conflicts:
	Megastore/src/main/webapp/WEB-INF/views/login.jsp