Issue #2226: Improve Sprite, Node, LabelTTF class define for maintainability and performance
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2226_RefactorRenderingClasses

Conflicts:
	cocos2d/sprite_nodes/CCSprite.js
issue #2772: Optimize Armature logic , add blend Type supported
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Armature
Closed #2226: Improve Sprite, Node, LabelTTF class define for maintainability and performance
Closed #2226: remove an unused variable "_opacity" from cc.LayerColor
Closed #2226: modify some comments
Merge pull request #1113 from dingpinglv/Iss2226_RefactorRenderingClasses

Closed #2226: Improve Sprite, Node, LabelTTF class define for maintainability and performance
issue #2772  add getPositionX and getPositionY for PhysicsSprite
issue #2772 remove CCPhysicsWorld.js
issue #2772 add collide for Armature
issue #2772 add async load for Armature
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Armature
issue #2772 move directory CCArmature to CocoStudio
Closed #2786: Refactor cc.PhysicsSprite for Performance
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2786_RefactorPhysicsSprite
Merge pull request #1117 from dingpinglv/Iss2786_RefactorPhysicsSprite

Closed #2786: Refactor cc.PhysicsSprite for Performance
closed #2772: fixed some bug for Armature
issue #2772 merge develop
issue #2772: delete CCShaderNode.js