Issue #2293 Migrate cc.Node to Cocos2d-x v2.1.4
Issue #2293 Migrate cc.Component, cc.ComponentContainer and cc.AtlasNode to Cocos2d-x v2.1.4
Issue #2293 Migrate cc.DrawNode to cocos2d-x v2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2293_MigrateRenderingSubclasses
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2293_MigrateRenderingSubclasses
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2293_MigrateRenderingSubclasses
Fixed #2293 Migrate the rendering subclasses of CCNode to Cocos2d-x 2.1.4
Merge pull request #993 from dingpinglv/Iss2293_MigrateRenderingSubclasses

Fixed #2293 Migrate the rendering subclasses of CCNode to Cocos2d-x 2.1.4
fixed: #2261 loader bug
fixed: #2261 loader bug
Merge pull request #995 from ShengxiangChen/issue2261_LoaderBug

fixed: #2261 loader bug
issue #2580: fixed typo and removed useless demo
issue #2580: removed useless demo
Merge pull request #996 from linshun/iss2580_v2.1.5

issue #2580: fixed typo and removed useless demo
The Object.defineProerty shim had a bogus check for browser implementation and this change fixes it.
Merge pull request #997 from oupengsoftware/taskbranch/COCOS2D-47

The Object.defineProerty shim had a bogus check for browser implementation and this change fixes it.
use native splice function for ArrayAppendObjectToIndex,ArrayAppendObjectsToIndex
Merge branch 'develop' of github.com:cocos2d/cocos2d-html5 into develop
fixed # 2294 Migrate Action class to Cocos2d-x 2.1.4
Merge branch 'develop' of Cocos2d-html5 into Iss2294_MigrateActionClasses

Conflicts:
	cocos2d/CCLoader.js