update send pic bug
delete the dead code
Merge branch 'master' into easemob-dev

Conflicts:
	ChatDemoUI/src/com/easemob/chatuidemo/activity/ChatActivity.java
	ChatDemoUI/src/com/easemob/chatuidemo/adapter/MessageAdapter.java