updata
updata
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	src/com/chatgame/adapter/FriendStatusListAdapter.java
	src/com/chatgame/component/photoview/PhotoViewAttacher.java
Merge branch 'master' of github.com:momoplan/Game2