Merge pull request #201 from pandamicro/master

Issue #4294: Fix bugs
Update submodules
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js