Issue #2416: modify some code to let tests works.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss2416_Renderer
Issue #2416: remove a superfluous testcase of LayerTests
Fixed #2416: update the reference of cocos2d-html5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss2416_Renderer
Merge pull request #1180 from dingpinglv/Iss2416_Renderer

Fixed #2416: modify some code to let tests works.