Issue #4277: merge latest of Cocos2d-js-tests to Cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Merge pull request #54 from dingpinglv/Iss4277_ReleaseV3.0

Issue #4277: merge latest of Cocos2d-js-tests to Cocos2d-js