Update submodules
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update submodules
Merge pull request #661 from pandamicro/master

Update submodules