hjhi
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/Item/ItemInfo/ItemInfoViewController.m