Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of http://github.com/VisualSJ/cocos2d-js