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

Conflicts:
	src/com/chatgame/activity/MainActivity.java
	src/com/chatgame/activity/login/LoginActivity.java