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

Conflicts:
	src/com/chatgame/activity/login/LoginActivity.java
update
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	res/layout/activity_input_code.xml
	res/layout/activity_register_two.xml
	res/layout/login.xml
	res/layout/resettingpassword.xml
Merge branch 'master' of github.com:momoplan/Game2
update
Merge branch 'master' of github.com:momoplan/Game2