Merge pull request #12 from RaoZiJian/myMaster

fix github comflex issues.
delete unused file
Merge pull request #13 from RaoZiJian/myMaster

add gameOverScene missing files.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae
change ImCrouch--->IMCrouch
add GameSceneMapLayer, and tiled map res.
Merge pull request #16 from shujunqiao/myWork

add map layer
modify map tmx to line.
Merge pull request #17 from shujunqiao/myWork

modify map tmx to line.
added gameCene to static add particle efferct
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-x-2.2.0/projects/Ironman/Resources/iphone/tiledmap/bg_00.tmx
	cocos2d-x-2.2.0/projects/Ironman/Resources/iphone/tiledmap/bg_1.tmx
	cocos2d-x-2.2.0/projects/Ironman/Resources/iphone/tiledmap/bg_2.tmx
	cocos2d-x-2.2.0/projects/Ironman/Resources/iphone/tiledmap/bg_3.tmx
gesture and action changge
fix ios project issues.