Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into develop
fixed #2082 fixed a bug of cc.SpriteBatchNode about zOrder, fixed a bug of cc.Sprite's setFlipX/Y on Canvas Mode
Merge pull request #918 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 fixed a bug of cc.SpriteBatchNode about zOrder, fixed a bug of cc.Sprite's setFlipX/Y on Canvas Mode
fixed #2082 add a Flag to HelloDomMenu/cocos2d.js for set it run Canvas Mode only.
issue #2082 fixing a bug of AnimationTest in CocosBuilderTest
fixed #2082 Fixed a bug of cc.Sprite on Canvas mode when a sprite was tinted and called setDisplayFrame
fixed #2082 Merge branch 'develop' of Cocos2d-html5
Merge pull request #919 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 Fixed a bug of cc.Sprite on Canvas mode when a sprite was tinted after called setDisplayFrame function
fixed #2082 fixed a bug of cc.Sprite's offset when a sprite have called setFlipX/Y
Merge pull request #920 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 fixed a bug of cc.Sprite's offset when a sprite has called setFlipX/Y
fixed #2134 fixed a bug of cc.Sprite when set color of Sprite to black
Merge pull request #921 from dingpinglv/Iss2134_CCLabelBMFont

fixed #2134 fixed a bug of cc.Sprite when set color of Sprite to black
fixed #2141 fixed a bug of cc.TextureCache that textureKeyName should be full path when removeTextureForKey
Merge pull request #922 from dingpinglv/Iss2141_textureKeyName

fixed #2141 fixed a bug of cc.TextureCache that textureKeyName should be full path when removeTextureForKey
Merge branch 'develop' into webaudio