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 branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2156 from dingpinglv/Iss5830_ccuiDoc

Issue #5830: add jsDoc to cc.ProtectedNode and ccui.Widget
Doc #5829: Fix issues in AtlasNode inline docs
Doc #5829: Fix issues in Node inline docs(half done)
Merge branches 'develop' and 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop

Conflicts:
	cocos2d/core/base-nodes/CCNode.js