fixed #2468 modify code to call public function "addTargetWithActionForControlEvents" of cc.ControlButton instead to protected function "_addTargetWithActionForControlEvent"
Merge pull request #198 from dingpinglv/Iss2468_FixCCBReaderBug

fixed #2468 modify code to call public function "addTargetWithActionForControlEvents" of cc.ControlButton instead to protected function "_addTargetWithActionForControlEvent"
Merge pull request #199 from xingsenma/master

Fixed #2485 Fixed a bug that cc.ArmatureDataManager have purged when schedule is still update
fixed #2481 modify codes to adapt rewritten RenderTexture for Canvas Mode
Merge pull request #200 from dingpinglv/Iss2481_RewriteRenderTexture

fixed #2481 modify codes to adapt rewritten RenderTexture for Canvas Mode
CocosBuilderTest is ok.
Minor fix in CCControlStepperTest.js
ExtensionTest works except Armature.
CocosBuilderTest needs to be js controlled in both cocos2d-html5 and cocos2d-x JSB. Before this change, it's also c++ controlled in cocos2d-htm5. IMHO, It's better to use just one strategy, which I mean js controlled, in cocos2d-html5.
Removing unused comments in CocosBuilderTest.js.
Merge branch 'cocosbuilder-test-js-controlled' of https://github.com/dumganhar/cocos2d-js-tests into cocosbuilder-test-js-controlled

Conflicts:
	tests/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js
Merge pull request #201 from dumganhar/cocosbuilder-test-js-controlled

CocosBuilderTest needs to be js controlled in both cocos2d-html5 and cocos2d-x JSB
fixed #2721: enable xmlhttprequest tests for web browsers.
fixed #2721: add xmlhttprequest on build.xml
Merge pull request #202 from linshun/master

fixed #2721: enable XmlHttpRequest for web browsers.
add "CCComponent.js" and "CCComponentContainer.js" to build.xml
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss2481_RewriteRenderTexture
Merge pull request #203 from dingpinglv/AddComponetFileToBuildxml

add "CCComponent.js" and "CCComponentContainer.js" to build.xml
fixed #2772: update Armature resources
closed #2772: Optimize Armature logic , add collide and blend Type supported