2.27角色详情小幅度修改
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/GameGroup.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/momoplan/gameiphone