fix get_num_of_cpu on win32.
fix get_num_of_cpu on win32.
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
Merge pull request #5219 from dabingnn/develop_hotFix

3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
Fix a mistake in Color4B(const Color3B& color).
Fixes a comment typo in CCObject.h.
Merge pull request #5220 from dumganhar/develop

Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h
Merge pull request #5218 from Dhilan007/develop_crash

fix get_num_of_cpu on win32.
fix link error on vs.
Merge pull request #5221 from Dhilan007/develop_vs

fix link error on vs.
issue #3837:Add the debug support for Mac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into runtime-lua
updated vs project[Lua]:
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
Merge pull request #5224 from Dhilan007/develop_crash

updated vs project[Lua]:
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.
update template for add socket files[lua]
Merge pull request #5226 from Dhilan007/develop_vs

update template for add socket files[lua]
issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug

Conflicts:
	cocos/scripting/lua/bindings/CCLuaStack.cpp