Updates cocos2d-x
Updates cocos2d-x
compilation error fixes.
Merge pull request #16 from dumganhar/master

Updates cocos2d-x
Merge pull request #17 from linshun/master

fixed #4175: Added js-bindings to excludeForder for WebStorm.
Merge pull request #18 from linshun/master

issue #4231: Swtiched to cocos2d-html5 develop-3.0 branch.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js