Issue #1615 modify TestCase for WebGL
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss1615_WebGLRendering
Merge pull request #13 from cocos2d/master

Updated with upstream.
Merge pull request #14 from cocos2d/master

Synchronizing to the latest cocos2d-js-test
Issue #1615 modify Tests for cc.DrawPrimitives, cc.TextureAtlas and cc.SpriteBatchNode
Merge pull request #15 from cocos2d/master

Updated with upstream.
Issue #1615 modify FontTest and TouchesTest for WebGL
Merge pull request #16 from cocos2d/master

Updated with upstream.
Issue #1615 Modify ParticleTest and LabelTest for WebGL
Issue #1615 modify TextureCacheTest.js for WebGL
Issue #1615 add EffectsAdvancedTest and ShaderTest to Tests
Fixed #1615 add MotionStreakTest, ClippingNodeTest to TestCases, fixed some corrects for SpriteTest
Fixed #1615 add RenderTestTest to Tests , correct errors of ExtensionTest and TileMapTest
Fixed #1615 Modify some codes of MoonWarriors for WebGL
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss1615_WebGLRendering
Fixed #1615 add resource path to preload list for WatermelonWithMe and Some TestCase
Fixed #1615 Merge Master branch of Ccocos2d-Html5 to webgl20
Merge branch 'master' of cocos2d-js-tests into Iss1615_WebGLRendering

Conflicts:
	tests/CocosNodeTest/CocosNodeTest.js
	tests/DrawPrimitivesTest/DrawPrimitivesTest.js
	tests/EffectsTest/EffectsTest.js
	tests/RenderTextureTest/RenderTextureTest.js
	tests/SpriteTest/SpriteTest.js
Fixed #1615 merge master branch of Cocos2d-Js-test to WebGLRendering
Merge branch 'master' of cocos2d-js-tests into Iss1615_WebGLRendering