issue #5977: update testcase add , make the sidebar changeed when user click right and left in the test scene
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge remote-tracking branch 'cocos/develop' into develop
Added missing properties for cp.SegmentShape
Added type and verts property for cp.PolyShape
Modify verts of cp.PolyShape to be compatible with Chipmunk.js
Added planes property of cp.PolyShape
Added a test for properties of shape
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
add resouce folder definition on linux
Merge pull request #2 from cocos2d/develop

dd
Update CMakeLists.txt
issue #1089: module separation for chipmunk
issue #1089: module separation for cocostudio
issue #1089: module separation for ccui
issue #1089: modify the bug of cocostudio file's name wrong
Added eachShape, eachConstraint, eachArbiter for cp.Body
use cc.defineGetterSetter for properties