swapped lines to prevent exception on assertion
Merge pull request #881 from dingpinglv/Iss1615_WebGLRendering

fixed #1615 remove some error checks for WebGL, fixed issue #879 and fixed a bug of cc.LabelTTF when init method without parameters.
Merge pull request #884 from ardcore/master

Thank you for your review, Szymon Piłkowski.
fixed #1615 fix a bug of cc.EditBox for WebGL and implemented PNGReader for cc.ParticleSystem
Revert "fixed #1615 fix a bug of cc.EditBox for WebGL and implemented PNGReader for cc.ParticleSystem"

This reverts commit 4c1d74fa50171e74f25c2bc5b531052d430a51b9.
fixed #1615 ParticleSystem has been support load texture from plist file
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into iss1615_WebGLRendering