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

Conflicts:
	server/weixinserver/apiDefinition.js
Merge branch 'neptune' of https://github.com/lejoying/weixintool into neptune