Issue #5968: remove a condition from TextureRenderCmd
Merge branch 'Renderer' of https://github.com/cocos2d/cocos2d-html5 into Iss5968_RefactorCanvasRenderer
Fixed some typo.
Issue #5933: The combined code (studio 10.14)
Issue #5933: Fixed a bug that pageview
Issue #5933: remove studio namespace
Issue #5968: refactor load event of texture, sprite frame and sprite etc
Merge branch 'Renderer' of https://github.com/cocos2d/cocos2d-html5 into Iss5968_RefactorCanvasRenderer
Merge pull request #2348 from dingpinglv/Iss5968_RefactorCanvasRenderer

Issue #5968: refactor load event of texture, sprite frame and sprite etc
remove the useless _handleScissor which broke scissor clip
Merge remote-tracking branch 'cocos/Renderer' into new_renderer
Merge pull request #2349 from joshuastray/new_renderer

remove the useless _handleScissor which broke scissor clip
issue #5849 : Return listener's reference for cc.eventManager.addListener()
issue #5979: add cocostudio file in build.xml
Fixed a bug of cc.view that it throws an error when html page doesn't add viewport meta
Merge pull request #2352 from dingpinglv/Iss5968_RefactorCanvasRenderer

Fixed a bug of cc.view that it throws an error when html page doesn't ad...
Merge pull request #2350 from joshuastray/new_renderer

issue #5849 : Return listener's reference for cc.eventManager.addListener
issue #5979: add cocostudio file in jsdoc_toolkit/build.xml
Merge pull request #2351 from jianglong0156/develop

issue #5979: add cocostudio file in build.xml
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss5968_RefactorCanvasRenderer

Conflicts:
	tools/build.xml