issue #5824: cc.place accept x,y
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into issue5824
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
issue #5824: add width & height properties for cc.Texture2D
issue #5824: propertiesForGID -> getPropertiesForGID
issue #5824: add deprecated note for ccui.Text.prototype.setText, getStringValue
issue #5824: add shader program constants
Fixed #5850: Move array utils functions together
Fixed #5784: Usage guide added for project.json in main.js
Fixed #5794: Combined SpiderMonkey's arm64&32 lib
Issue #5824: Support cc.easeBezierAction with multiple parameters in JSB
Issue #5824: Support setSpeed/getSpeed for cc.ActionInterval in JSB
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
Merge pull request #730 from joshuastray/issue5824

Issue5824: fix api difference between h5 and jsb
[AUTO] : updating jsbinding automatically
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop