Fixed some mistakes for js-tests
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Fixed a bug of CocosNodeTest for new renderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop

Conflicts:
	samples/js-tests/src/CocosStudio2.0/UIFromCsb.js
Merge pull request #868 from dingpinglv/develop

Fixed some mistakes for js-tests