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

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/application/MyApplication.java