simple
Merge branch 'master' into WorldChannel
世界频道首页UI微调
修复发送图片bug
Merge branch 'WorldChannle'

Conflicts:
	src/com/chatgame/adapter/FriendStatusListAdapter.java