add audioplayer.js to cocos2d.js
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity into myWork
modify map layer and audio layer.
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
Merge pull request #6 from shujunqiao/myWork

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

Conflicts:
	cocos2d-html5_i/IronCity/main.js
modify resource.
Merge pull request #7 from shujunqiao/myWork

modify resource.