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

Conflicts:
	res/layout/activity_add_newpet.xml
	res/layout/activity_my_pet.xml
	src/com/chatgame/activity/login/LoginActivity.java
	src/com/chatgame/activity/personalCenter/FeedBackActivity.java
	src/com/chatgame/activity/personalCenter/MyPetGragGridViewActivity.java
	src/com/chatgame/activity/personalCenter/PersonalCenterActivity.java
	src/com/chatgame/activity/personalCenter/PetDetailActivity.java
	src/com/chatgame/activity/personalCenter/UserGragGridViewActivity.java
	src/com/chatgame/adapter/UserAdapter.java
	src/com/chatgame/component/view/DragGridView.java
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	src/com/chatgame/activity/MainActivity.java
	src/com/chatgame/activity/personalCenter/PetDetailActivity.java