发送方式
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/GameGroup/GameGroup-Prefix.pch
	GameGroup/MePage/Group/GroupSetting/NewGroupSettingViewController.m