Update the submodule about `cocos2d-x`
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
close #4284:Update the ‘cocos2d-x’ submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Update config files for bindings-generator
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Update config files for bindings-generator
Merge pull request #63 from samuele3hu/bug_fix

Update config files for bindings-generator
[AUTO] : updating jsbinding automatically
Merge pull request #65 from CocosRobot/update_js_bindings_1394182322

[AUTO] : updating jsbinding automatically
Issue #4294: Fix menu test error with another implementation
Issue #4294: Remove Node Camera test and OpenGL test for JSB, bind GLProgram::addAttribute
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js