change login
Merge branch 'neptune' of https://github.com/lejoying/weixintool into Branch_0b2b9e596aa7b606ac54ed29119cc1cc7ff178c2
Merge branch 'neptune' of https://github.com/lejoying/weixintool into Branch_0b2b9e596aa7b606ac54ed29119cc1cc7ff178c2
password
change
Merge branch 'neptune' of https://github.com/lejoying/weixintool into temp1

Conflicts:
	web/static/js/login.js
	weixinserver/handlers/accountManage.js