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
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Armature

Conflicts:
	cocos2d/CCLoader.js
Fixed #2299 add Armature compress for template
Merge pull request #1003 from xingsenma/Armature

Fixed  #2299  Integrated armature module