Merge pull request #940 from ShengxiangChen/issue_comliper

"ccConfig" is invalid when using google closure compiler
Merge pull request #969 from linshun/iss2264_v2.1.4

issue #2264 sync v2.1.4 from develop branch to master branch
Merge pull request #971 from dingpinglv/Iss2144_FixBugForParticleSystem

fixed #2144 modify condition for WebGL Mode.
Merge pull request #973 from linshun/iss2264_v2.1.4

issue #2264: updated changelog
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 example code in ccMenuItem.js, line 1147 for ccMenuItemToggle
Merge pull request #991 from mcscooter/master

Fixed example code in ccMenuItem.js
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