fix run build-win32.bat build fail
Merge pull request #3834 from Dhilan007/master

[ci skip]fix run build-win32.bat build fail
[master] Update JS-Test. Disable TestColliderDetector for JSB temporarily
Merge pull request #3836 from dumganhar/master

[master] Update JS-Test. Disable TestColliderDetector for JSB temporarily
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test