monster
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-x-2.2.0/projects/Ironman/Classes/GameSceneMenuLayer.h
fix a bug