Merge branch 'official/master'

Conflicts:
	CHANGELOG
	cocos2d-wp8.vc2012.sln
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/cocos2d.cpp
	extensions/Android.mk
	extensions/CocoStudio/Action/CCActionEaseEx.cpp
	extensions/CocoStudio/Armature/CCArmature.cpp
	extensions/CocoStudio/Armature/CCBone.cpp
	extensions/CocoStudio/Armature/CCBone.h
	extensions/CocoStudio/Armature/animation/CCArmatureAnimation.cpp
	extensions/CocoStudio/Armature/animation/CCTween.cpp
	extensions/CocoStudio/Armature/display/CCBatchNode.cpp
	extensions/CocoStudio/Armature/display/CCDisplayManager.cpp
	extensions/CocoStudio/Armature/display/CCDisplayManager.h
	extensions/CocoStudio/Armature/utils/CCArmatureDefine.h
	extensions/CocoStudio/Components/CCComAttribute.cpp
	extensions/CocoStudio/Components/CCComAttribute.h
	extensions/CocoStudio/Components/CCComAudio.cpp
	extensions/CocoStudio/Components/CCComAudio.h
	extensions/CocoStudio/Components/CCComController.h
	extensions/CocoStudio/Components/CCComRender.h
	extensions/CocoStudio/GUI/BaseClasses/UIRootWidget.cpp
	extensions/CocoStudio/GUI/BaseClasses/UIRootWidget.h
	extensions/CocoStudio/GUI/Layouts/UILayout.cpp
	extensions/CocoStudio/GUI/Layouts/UILayout.h
	extensions/CocoStudio/GUI/Layouts/UILayoutDefine.h
	extensions/CocoStudio/GUI/Layouts/UILayoutParameter.cpp
	extensions/CocoStudio/GUI/Layouts/UILayoutParameter.h
	extensions/CocoStudio/GUI/System/CocosGUI.h
	extensions/CocoStudio/GUI/System/UIHelper.cpp
	extensions/CocoStudio/GUI/System/UIHelper.h
	extensions/CocoStudio/GUI/System/UIInputManager.cpp
	extensions/CocoStudio/GUI/System/UIInputManager.h
	extensions/CocoStudio/GUI/System/UILayer.cpp
	extensions/CocoStudio/GUI/System/UITouchGroup.h
	extensions/CocoStudio/GUI/UIWidgets/Compatible/CompatibleClasses.h
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.cpp
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.h
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListViewEx.cpp
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListViewEx.h
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.cpp
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.h
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollInterface.h
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.cpp
	extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.h
	extensions/CocoStudio/GUI/UIWidgets/UIButton.cpp
	extensions/CocoStudio/GUI/UIWidgets/UIButton.h
	extensions/CocoStudio/GUI/UIWidgets/UICheckBox.cpp
	extensions/CocoStudio/GUI/UIWidgets/UICheckBox.h
	extensions/CocoStudio/GUI/UIWidgets/UIImageView.cpp
	extensions/CocoStudio/GUI/UIWidgets/UIImageView.h
	extensions/CocoStudio/GUI/UIWidgets/UILabel.cpp
	extensions/CocoStudio/GUI/UIWidgets/UILabel.h
	extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.cpp
	extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.h
	extensions/CocoStudio/GUI/UIWidgets/UISlider.cpp
	extensions/CocoStudio/GUI/UIWidgets/UISlider.h
	extensions/CocoStudio/Reader/SceneReader.h
	extensions/CocoStudio/Trigger/TriggerBase.cpp
	extensions/CocoStudio/Trigger/TriggerBase.h
	extensions/proj.emscripten/Makefile
	extensions/proj.linux/Makefile
	extensions/proj.marmalade/cocos2dx-ext.mkf
	extensions/proj.nacl/Makefile
	extensions/proj.winrt/libExtensions.vcxproj
	extensions/proj.winrt/libExtensions.vcxproj.filters
	extensions/proj.winrt/libExtensions_2013.vcxproj
	extensions/proj.winrt/libExtensions_2013.vcxproj.filters
	extensions/proj.wp8/libExtensions.vcxproj
	extensions/proj.wp8/libExtensions.vcxproj.filters
	samples/Cpp/AssetsManagerTest/proj.ios/AssetsManagerTest.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/AppDelegate.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesEquipScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesMapScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesPageScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesRegisterScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesRegisterScene.h
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIExamplesWeaponScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.h
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
	samples/Cpp/TestCpp/Classes/controller.cpp
	samples/Cpp/TestCpp/proj.emscripten/Makefile
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.linux/Makefile
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb
	samples/Cpp/TestCpp/proj.nacl/Makefile
	samples/Cpp/TestCpp/proj.winrt/TestCpp.vcxproj
	samples/Cpp/TestCpp/proj.winrt/TestCpp.vcxproj.filters
	samples/Cpp/TestCpp/proj.winrt/TestCpp_2013.vcxproj
	samples/Cpp/TestCpp/proj.winrt/TestCpp_2013.vcxproj.filters
	samples/Cpp/TestCpp/proj.wp8-xaml/TestCpp/TestCpp/TestCpp.csproj
	samples/Cpp/TestCpp/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj
	samples/Cpp/TestCpp/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj.filters
	samples/Cpp/TestCpp/proj.wp8/TestCpp.vcxproj
	samples/Cpp/TestCpp/proj.wp8/TestCpp.vcxproj.filters
	samples/Javascript/CocosDragonJS/proj.ios/CocosDragonJS.xcodeproj/project.pbxproj
	samples/Javascript/CrystalCraze/proj.ios/CrystalCraze.xcodeproj/project.pbxproj
	samples/Javascript/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj
	samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
	samples/Javascript/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj
	samples/Javascript/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj
	samples/Lua/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Classes/AppDelegate.cpp
	samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
	samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua
	samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
	samples/Lua/TestLua/proj.ios/TestLua.xcodeproj/project.pbxproj
	scripting/javascript/bindings/ScriptingCore.cpp
	scripting/javascript/bindings/js/jsb_cocos2d.js
	scripting/javascript/bindings/js/jsb_cocos2d_studio.js
	scripting/javascript/bindings/jsb_cocos2dx_studio_manual.cpp
	scripting/lua/cocos2dx_support/LuaCocoStudio.cpp
	scripting/lua/cocos2dx_support/lua_cocos2dx_cocostudio_manual.cpp
	template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj
	template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj
	template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj
	template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj
	tools/tojs/cocos2dx_studio.ini
	tools/tolua++/CCEditBox.pkg
	tools/tolua++/CocoStudio.pkg
	tools/tolua++/basic_cocostudio.lua