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

Conflicts:
	GameGroup/Item/CreateItem/NewCreateItemViewController.m
	GameGroup/Item/ItemInfo/ItemInfoViewController.m
	GameGroup/Item/MainView/NewItemMainViewController.m
	GameGroup/Item/findItem/BaseItemCell.m
	GameGroup/Resource/Image/Item/joinInBtn_Item.png