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

Conflicts:
	src/com/chatgame/activity/personalCenter/SettingActivity.java