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/
Update CHANGELOG [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5155 from CocosRobot/updategeneratedsubmodule_1390364448

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontDefinition.cpp
issue #3677: Adds EventDispatcher performance test.
issue #3677: Updates Android.mk and CMakeLists.txt.
deprecated some functions in Object
issue #3677: Updates Windows project to add PerformanceEventDispatcherTest.
issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.