Fixed #5941: modified some testcases for new renderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss5941_RendererWebGL
Merge pull request #829 from pandamicro/develop

Feature #5676: Add new assets and upgrade resolution of MoonWarriors
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss5941_RendererWebGL
Merge pull request #830 from dingpinglv/Iss5941_RendererWebGL

Fixed #5941: modified some testcases for new renderer
Fixed #5943: Fix a issue of cached texture loading
Remove ActionTimelineTest for JSB
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop