change ccpool hasOjb to hasObject  and change removeObj to removeObject
Doc #5829: Match shaderProgram getter/setter functions in JSB
Merge pull request #728 from wuzhiming/fb_3rd

change ccpool hasOjb to hasObject  and change removeObj to removeObject
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #729 from pandamicro/develop

Doc #5829: Match shaderProgram getter/setter functions in JSB
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into issue5824

Conflicts:
	tools/tojs/cocos2dx.ini