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
Issue #2295 Migrate 3D effects to Cocos2d-x v2.1.4
Fix the single page version of cocos2d-js-tests til the point that PerformanceSpriteTest can be run.
optimize
Merge remote-tracking branch 'origin/develop' into optimizeForMobileBrowser
fixed #2295 Migrate 3D effects to Cocos2d-x v2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2295_Migrate3DEffects
Fix line height in multiline LabelTTF
fix Scale9Sprite pixel overlapping in Canvas browsers
Merge pull request #1003 from xingsenma/Armature

Fixed  #2299  Integrated armature module
Merge pull request #1005 from dingpinglv/Iss2295_Migrate3DEffects

fixed #2295 Migrate 3D effects to Cocos2d-x v2.1.4
fixing ccNode.setScale when scaleY === 0
fixing ccNode.setScale when scaleY === 0
Merge branch 'setScaleFix' of github.com:MarkEHenderson/cocos2d-html5 into setScaleFix

Conflicts:
	cocos2d/base_nodes/CCNode.js
Merge pull request #1004 from oupengsoftware/taskbranch/COCOS2D-48

Fix the single page version of cocos2d-js-tests til the point that PerformanceSpriteTest can be run.