替换 加载图片工具为xUtils
修改细节BUG
解决冲突
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	src/com/chatgame/adapter/FriendStatusListAdapter.java
	src/com/chatgame/adapter/MyPingLunListAdapter.java
	src/com/chatgame/component/view/ImageBrowserAdapter.java