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
Issue #5835: Add getPermissionList and modify callback
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2151 from mutoo/develop

fix ui animation does not easing issue;
Issue #5830: add jsDoc to cc.ProtectedNode and ccui.Widget
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5830_ccuiDoc