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

Conflicts:
	web/test/qj/step.html
	web/test/qj/step_1.html
Merge branch 'neptune' of https://github.com/lejoying/weixintool into neptune

Conflicts:
	web/test/qj/step.html
	web/test/qj/step_1.html