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
add resouce folder definition on linux
Merge pull request #2 from cocos2d/develop

dd
Update CMakeLists.txt
Merge pull request #1091 from pandamicro/develop

Bug fixes
Fixed typos
Fixed memory leak in bindings of cpSplittingPlane
Revert "Fix Bug: PrebuiltRuntime ios version can't support portrait orientation."
Merge pull request #1090 from joshuastray/fix-color-picker-crash

Fix color picker crash
Merge pull request #1096 from cocoscodeide/revert-1081-develop

Revert "Fix Bug: PrebuiltRuntime ios version can't support portrait orie...
Update README.md
Merge pull request #1083 from joshuastray/shape

add missing properties of cp.SegmentShape and cp.PolyShape
Issue #1104: [JSB] Fix ccui.CheckBox's _ctor function