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
Temp Fixed #1085: Explicitly call default init function for ccui.Button's constructor
Fixed #1086: Fixed ccs.ArmatureAnimation's setFrameEventCallFunc and setMovementEventCallFunc accepts one parameter
Fixed #1087: Sets debugMode and frameRate with project.json config for JSB
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
Update html5 engine
Fixed #2433: Add test case for this fix
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