Merge branch '3d-extension' of https://github.com/houguohua/cocos2d-x into 3d-extension

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCComponent.cpp
	cocos/2d/CCComponent.h
	cocos/2d/CCComponentContainer.cpp
	cocos/2d/CCComponentContainer.h
	cocos/2d/CCDeprecated.h
	cocos/2d/CCFontAtlasCache.cpp
	cocos/2d/CCFontAtlasCache.h
	cocos/2d/CCFontAtlasFactory.cpp
	cocos/2d/CCFontAtlasFactory.h
	cocos/2d/CCIMEDispatcher.cpp
	cocos/2d/CCMenuItem.cpp
	cocos/2d/CCMotionStreak.cpp
	cocos/2d/CCNotificationCenter.cpp
	cocos/2d/CCParticleExamples.cpp
	cocos/2d/CCSpriteBatchNode.cpp
	cocos/2d/CCSpriteBatchNode.h
	cocos/2d/CCTextureAtlas.cpp
	cocos/2d/CCTextureAtlas.h
	cocos/2d/CCTextureCache.cpp
	cocos/2d/cocos2d.vcxproj.filters
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/android/CCFileUtilsAndroid.cpp
	cocos/2d/platform/android/CCFileUtilsAndroid.h
	cocos/2d/platform/win32/CCFileUtilsWin32.cpp
	cocos/2d/platform/win32/CCFileUtilsWin32.h
	cocos/base/CCData.h
	cocos/base/CCString.h
	cocos/editor-support/spine/CCSkeleton.cpp
	cocos/editor-support/spine/CCSkeleton.h
	cocos/editor-support/spine/CCSkeletonAnimation.cpp
	cocos/editor-support/spine/CCSkeletonAnimation.h
	cocos/editor-support/spine/spine-cocos2dx.h
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
	samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp
	samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.h
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.h
	samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp
	samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.cpp
	samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.h
	tools/tojs/cocos2dx_spine.ini