Merge pull request #20 from RaoZiJian/myMaster

Add setting menu resources and code.
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
modify player, add move attack function.
monster distroy
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
Merge pull request #22 from shujunqiao/myWork

modify player, add move attack function.
monster moving
collision detection
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae
modified attack resources.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myMaster