wzg 修复BUG #6443
Merge branch 'master' of https://github.com/jiangzhen1984/V2TechConferenceClient

Conflicts:
	source/src/com/v2tech/view/conversation/ConversationView.java