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