Merge pull request #856 from dingpinglv/Iss1615_WebGLRendering

Fixed #1615 Optimization performance for TextureAtlas
sorry,it's a typo that leads to the inability to detect correctly.
Merge pull request #857 from ShengxiangChen/issueXXX_AccelerateForHTML5AndJSB

sorry,it's a typo that leads to the inability to detect correctly.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into iss1615_WebGLRendering
Merge branch 'webgl20' of https://github.com/cocos2d/cocos2d-html5 into iss1615_WebGLRendering
Fixed #1615 Optimization performance for cc.Sprite