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

Conflicts:
	src/com/chatgame/utils/common/PublicMethod.java
Merge branch 'master' of github.com:momoplan/Game2