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 branch 'Renderer' of git://github.com/cocos2d/cocos2d-html5 into Renderer
Issue #5933: Scale9Sprite
Issue #5933: setColor
Issue #5933: Remove toRenderer
Merge pull request #2274 from VisualSJ/Renderer

Issue #5933: fixed bug
Merge branch 'Renderer' of git://github.com/cocos2d/cocos2d-html5 into new_renderer

Conflicts:
	cocos2d/particle/CCParticleSystem.js