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

Conflicts:
	weixinPlatform/resource/weixin/struts-message-info.xml
	weixinPlatform/root/WEB-INF/pages/talkInfo/messageIndex.jsp
	weixinPlatform/root/WEB-INF/pages/talkInfo/talkInfo.jsp
	weixinPlatform/src/com/weixin/webui/end/TalkMessageAction.java