Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
fix windows compile error
Merge branch 'v3' into cleanupBinaryLoader
Merge pull request #7123 from andyque/cleanupBinaryLoader

cocostudio binary parser
Merge pull request #7157 from 2youyouo2/v3

update action timeline
[AUTO][ci skip]: updating cocos2dx_files.json
simplify shader, bath sprite3D render
added missing cocoloader files
added missing files for wp8
Sprite3D render batch, not finished
batch sprite3D rendering
Merge branch 'v3' into feature5161

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ)
Fix compile error for lua bindings in the different platforms
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
issue #5161, replace deprecated methods
Merge pull request #7131 from samuele3hu/v3_lua_fix

Add Lua binding for Animation3D and Animate3D ,and add related test case.
[ci skip]
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7181 from CocosRobot/update_cocosfiles_1403577062

[AUTO][ci skip]: updating cocos2dx_files.json