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

Conflicts:
	GameGroup/MePage/Group/GroupOfMine/MyGroupViewController.m
	GameGroup/StartView/StartViewController.m