optimiz
`Merge branch 'develop' of https://github.com/momoplan/weixin into develop

Conflicts:
	pom.xml