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
mac/CCEGLView moved to desktop/
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontDefinition.cpp
issue #3812: using std::vector<QuadCommand*> to hold current batched command
update github api url and jenkins job trigger url
Merge branch 'develop' into develop_refactor_culling

* develop: (127 commits)
  issue #3677: Wrong include fix.
  issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
  issue #3677: Updates Windows project to add PerformanceEventDispatcherTest.
  issue #3677: Updates Android.mk and CMakeLists.txt.
  issue #3677: Adds EventDispatcher performance test.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3713: every autorelease will cause a release operation
  do not mix github access token with jenkins job trigger token
  issue #3781, Update travis-scripts, llvm-installing parts no need now.
  issue #3713: use reference in loop
  issue #3781, Minor fix & update submodule.
  closed #3808: EditBox on Mac works again.
  issue #3713:fix memory leak of autoreleas pool
  closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
  global Z order uses floats
  ActionsProgress test include fixes
  Removed unused code and files.
  ...

Conflicts:
	cocos/2d/renderer/CCRenderer.cpp
issue #2572, Add test case for issue 2572.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #3812: remove member variable _firstCommand, remove comment codes
issue #3812: remove member variable _lastCommand
issue #2572, Optimize the code of test case for issue 2572.