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

Conflicts:
	GameGroup/MePage/Group/GroupInfo/GroupInformationViewController.m
	GameGroup/MePage/Group/GroupSetting/GroupSettingController.m