Issue #5215: Modify some index list
Issue #5106: Restore error modification
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #381 from VisualSJ/master

Issue #5215: Modify some index list