win32 bug
modified ios project.
Merge pull request #7 from shujunqiao/myMaster

modified ios project.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-x-2.2.0/projects/Ironman/proj.ios/Ironman.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/RaoZiJian/cocostudioSampleGmae into testBranch
Add more IronMan Animation Resources.
Modified GameScenePlayLayer.