wzg 优化多文件传送 各种类型文件icon 修复BUG #5605
Merge branch 'master' of https://github.com/jiangzhen1984/V2TechConferenceClient

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