fixed #4231: updated cocos2d-x to latest commit of develop branch.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #19 from linshun/master

fixed #4231: updated cocos2d-x to latest commit of develop branch.