1. properties文件编码修正
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/META-INF/weixin.properties