fixed #2299 add json to cc.RESOURCE_TYPE
Fixed #2299  Finished the function of Armature
fixed #2292 Reformat code and Add copyright
fixed #2299 add explain for Armature
Fix the single page version of cocos2d-js-tests til the point that PerformanceSpriteTest can be run.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Armature

Conflicts:
	cocos2d/CCLoader.js
Fixed #2299 add Armature compress for template
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.
Merge pull request #1006 from MarkEHenderson/develop

Fixing line height for multiline LabelTTF and overlapping pixels in Scale9Sprite on Canvas browsers
Merge pull request #1007 from MarkEHenderson/setScaleFix

Fixes ccNode.setScale when scaleY === 0
fixed #2295 fixed a bug that some waring message of WebGL shows when load loading scene.