Fix for compiling error for windows
Bug fixes for new label
convert tab to space
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
Merge remote-tracking branch 'remotes/upstream/develop' into develop
issue #3781, Update genbinding script to fit new bindings-generator.
issue #3781: Fix the variable name.
issue #3781, Add windows bat script.
close #3805:fix wrap error and alignment error.
issue #3781, js not generate cocos2dx physics now.
Fixed #3806: SAXParser supported with manual binding in JSB
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
issue #3781, Undefine the __MINGW32__ macro to fix the script error on windows
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
mac/CCEGLView moved to desktop/
closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
issue #3713:fix memory leak of autoreleas pool
Merge branch 'iss3713-replace_CCObject' of https://github.com/minggo/cocos2d-x into iss3713-replace_CCObject
closed #3808: EditBox on Mac works again.
issue #3781, Minor fix & update submodule.