修改city
修改许愿池
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/GameGroup/GameGroup-Prefix.pch