小改动
Merge branch 'master' of https://github.com/jy1981/SangoWar

Conflicts:
	proj.ios_mac/HeroGame.xcodeproj/project.pbxproj