Fix Bug
Merge branch 'master' of https://github.com/jiangzhen1984/V2TechConferenceClient

Conflicts:
	source/src/com/v2tech/view/conference/VideoActivityV2.java
	source/src/com/v2tech/view/conference/VideoMsgChattingLayout.java