Update the JS binding for plugin
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/natural-law/cocos2d-x