fix reloading can not intoscene
solve some gameOverLayer issues.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myMaster
attack animation
Merge pull request #26 from RaoZiJian/myMaster

solve some issues of gameover layer.
fix after attrate player disappear
attacking can not to do other action
aa
delete crouch action
modify attack.
Merge pull request #27 from shujunqiao/myWork

modify attack.
add boundingBox
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-x-2.2.0/projects/Ironman/Classes/GameScenePlayLayer.cpp
add boundingbox
modify Laser.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
boundingbox to public
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
monster methed to public
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork