add some png.
add res of music and modify MainMenuScene/resource/GameScenePlayLayer/GameSceneOverLayer.js.
Merge pull request #1 from shujunqiao/myWork

add res of music and modify MainMenuScene/resource/GameScenePlayLayer/Ga...
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity

Conflicts:
	cocos2d-html5_i/IronCity/src/other/AudioPlayer.js
	cocos2d-html5_i/IronCity/src/resource.js
	cocos2d-html5_i/IronCity/src/scene/MainMenuScene.js
add audioplayer.js to cocos2d.js
Merge pull request #2 from shujunqiao/master

modify cocos2d.js
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity into myWork
modify map layer and audio layer.
fix speedbug
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity into myWork
upload 2 Resource
upload ignore list
modify laser/map/audio.js.
modify brood->blood and add some notes.
modify cocostudio gui bug.
Merge pull request #4 from shujunqiao/myWork

modify map and audio layer.
modify cocostudio, modify resource.js、set、over、monster、menu layer.
Merge pull request #5 from shujunqiao/myWork

modify cocostudio, modify resource.js、set、over、monster、menu layer.
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity
modify monster.
recoding