fixed the setter bug
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
fixed cc.sys.os bug
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2146 from musikov/develop

fixed CCProgressTimer draw on canvas with colorized sprite
Fixed #5833: add a check to cc.Scale9Sprite._cacheScale9Sprite
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5833_Scale9Sprite
Merge pull request #2147 from dingpinglv/Iss5833_Scale9Sprite

Fixed #5833: add a check to cc.Scale9Sprite._cacheScale9Sprite
Correct a mistake of cc.Scale9Sprite