Closed #2748: Fixed a bug of cc.ProgressTimerCanvas that it is error display  when it flip.
fixed #2763:fixed ccb parser bug
closed #2748: clipping region also must use   save and  restore
Merge pull request #1112 from xingsenma/Flip

closed #2748: Fixed some bugs about flip.
Merge pull request #1109 from dingpinglv/Iss2762_RefactorSimpleAudioEngine

Closed #2762: Refactor CCSimpleAudioEngine.js for code maintainability
fixed #2763:fixed ccb parser bug
Merge pull request #1111 from ShengxiangChen/CCBPaserBug

fixed #2763:fixed ccb parser bug
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