Issue #2293 add CCComponent.js and CCComponentContainer.js to build.xml
Fixed #2293 Migrate the rendering subclasses of CCNode to Cocos2d-x 2.1.4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss2293_MigrateRenderingSubclasses

Conflicts:
	tests/LabelTest/LabelTest.js
Merge pull request #178 from dingpinglv/Iss2293_MigrateRenderingSubclasses

Fixed #2293 Migrate the rendering subclasses of CCNode to Cocos2d-x 2.1.4