update cocos2d-x submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
update submodule
Merge pull request #123 from lihex/master

update submodule