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 branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
change ccpool hasOjb to hasObject  and change removeObj to removeObject
Merge pull request #2163 from wuzhiming/developer_pool

Developer pool