阿斯顿发生法士大夫
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/Item/MainView/NewItemMainViewController.m