Merge pull request #2296 from VisualSJ/Renderer-canvas

Issue #5933: UIText UITextField UILayout(clipping)
Merge pull request #2297 from VisualSJ/Renderer-canvas

Issue #5933: NodeGrid
Issue #5941: refactor ClippingNode for new renderer webgl
Merge branch 'Renderer' of https://github.com/cocos2d/cocos2d-html5 into Iss5941_WebGLRenderer
Merge pull request #2298 from dingpinglv/Iss5941_WebGLRenderer

Issue #5941: refactor ClippingNode for new renderer webgl
Issue #5933: Armature