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

Conflicts:
	src/com/chatgame/activity/login/CharactersMessageInfoActivity.java
	src/com/chatgame/activity/login/FindRoleActivity.java
	src/com/chatgame/activity/login/RegistetVerifyPhoneActivity.java
	src/com/chatgame/adapter/CharactersMessageAdatper.java
Merge branch 'master' of github.com:momoplan/Game2