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

Conflicts:
	GameGroup/MePage/CircleHeadViewController.m
1