Merge pull request #4436 from samuele3hu/master_cocostudio

Fix:Resolve some small bug of master
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_cocostudio