Merge branch 'master' of https://github.com/wgzhxy/weixin

Conflicts:
	weixinPlatform/logs/error/error.log
	weixinPlatform/logs/info/info.log
	weixinPlatform/root/WEB-INF/pages/talkInfo/messageIndex.jsp
Merge branch 'master' of https://github.com/wgzhxy/weixin