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

Conflicts:
	GameGroup/PublicClass/viewController/DataStore/DataStoreManager.m