no message
Merge branches 'master' and 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/Item/MainView/NewItemMainViewController.m