Update read me
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
add clear all script support
fix:runtime crash when upload file to Mac/Win32
Merge pull request #790 from cocoscodeide/develop

add clear all script support
add missing methods in cp.Vect.prototype and cp.v
include chipmunk_private.h for private function access and add active for cp.shape
add missing properties for cp.Shape
Fixed #5943: Support local image for cc.loader.loadImg, and improve image loading logic
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Fixed #5943: Fix issue about getRes for cached resources
Fixed #5943: Fix issue of last commit
Merge pull request #791 from joshuastray/chipmunk

[JSB] add missing api for cp.Vect and cp.Shape
Merge pull request #792 from pandamicro/develop

Fixed #5943: Support local image for cc.loader.loadImg, and improve image loading logic
Merge pull request #1 from cocos2d/develop

合并更新内容