Merge branch 'neptune' of bind
Merge branch 'neptune' of https://github.com/lejoying/weixintool into neptune

Conflicts:
	web/static/js/login.js
	web/ue/user_mange.html