Fix for compiling error for windows
Bug fixes for new label
convert tab to space
issue #3401: add lua physics slide test, add more banding code, and fix some bugs.
issue #3401: add physics action and pump test for lua.
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
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
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontDefinition.cpp
update github api url and jenkins job trigger url
Fixed #3806: Change parameters to const &
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Fixed #3806: Update tests 3.0
Issue #3806: Update shared tests_v3.0 of js test cases
set pr status at post build stage
Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'.
fix:Update the RELEASE_NOTES.md file
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix