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

Fixed example code in ccMenuItem.js
fixed # 2294 Migrate Action class to Cocos2d-x 2.1.4
Merge branch 'develop' of Cocos2d-html5 into Iss2294_MigrateActionClasses

Conflicts:
	cocos2d/CCLoader.js
Merge pull request #998 from 06wj/develop

update cc.ArrayAppendObjectToIndex，cc.ArrayAppendObjectsToIndex
fixed #2294 Migrate Action class to Cocos2d-x 2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2294_MigrateActionClasses
Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release.
Merge pull request #999 from dingpinglv/Iss2294_MigrateActionClasses

fixed # 2294 Migrate Action class to Cocos2d-x 2.1.4
Merge pull request #1000 from ShengxiangChen/issue2261_LoaderBug

Currently JavaScript Bindigns (JSB), in some cases, needs to use retain ...
Issue #2295 Migrate 3D effects to Cocos2d-x v2.1.4
fixed #1001 fixed a bug that LabelTTF dimension behavior doesn't support height=0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss1001_LabelTTFSupportHeight=0
fixed #2299 add json to cc.RESOURCE_TYPE
Fixed #2299  Finished the function of Armature
fixed #2292 Reformat code and Add copyright