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

Conflicts:
	src/com/chatgame/activity/guide/StartActivity.java
	src/com/chatgame/activity/login/RegistetThreeActivity.java
	src/com/chatgame/activity/login/RegistetTwoActivity.java
	src/com/chatgame/model/GameRoseInfo.java
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	src/com/chatgame/activity/login/RegisterBinderRoseActivity.java
	src/com/chatgame/activity/login/RegisterCheckPhoneActivity.java
	src/com/chatgame/activity/login/RegistetUserDetailInfoActivity.java
	src/com/chatgame/activity/login/RegistetVerifyPhoneActivity.java
Merge branch 'master' of github.com:momoplan/Game2