Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
close #4285: Modify the mechanism of add.*EventListener bound to js for cocos2d ui
Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Merge pull request #97 from samuele3hu/bug_fix

close #4285: Modify the mechanism of  callback bound to js for  studio ui and armature