event
Merge branch 'develop'

Conflicts:
	api-server/src/helpers/wechat.js
	api-server/src/helpers/wechat.ls
event