Update cocos2d-x
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update plugin ref to original repo
Merge pull request #714 from pandamicro/develop

Update cocos2d-x