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

Conflicts:
	src/com/chatgame/activity/BaseActivity.java
	src/com/chatgame/activity/login/RegisterCheckPhoneActivity.java
	src/com/chatgame/utils/common/PublicMethod.java