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

Conflicts:
	src/com/chatgame/activity/login/LoginActivity.java
	src/com/chatgame/activity/login/RegisterOneActivity.java
	src/com/chatgame/common/AsyncTask/OpenAsyncTask.java
	src/com/chatgame/data/service/FriendListService.java
Merge branch 'master' of github.com:momoplan/Game2