upgrade chipmunk.js to newest version
Fixes the type of the property 'placeHolder' from Number to String.
Merge pull request #2270 from claudiofreitas/develop

Fixes the type of the property 'placeHolder' from Number to String.
Merge pull request #2271 from joshuastray/chipmunk

upgrade chipmunk.js to newest version
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Renderer
Merge pull request #2272 from VisualSJ/Renderer

Clipping Node
Issue #5941: adds WebGL renderer to H5
Merge branch 'Renderer' of https://github.com/cocos2d/cocos2d-html5 into Iss5941_WebGLRenderer

Conflicts:
	cocos2d/core/renderer/RendererCanvas.js
Merge pull request #2273 from dingpinglv/Iss5941_WebGLRenderer

Issue #5941: adds WebGL renderer to H5
Merge branch 'Renderer' of git://github.com/cocos2d/cocos2d-html5 into Renderer
Issue #5933: Scale9Sprite
Issue #5933: setColor