wechat整理

wechat整理
Merge remote-tracking branch 'origin/master'

Conflicts:
	wechat/target/maven-archiver/pom.properties
	wechat/target/wechat.war