issue #5824: cc.place accept x,y
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into issue5824
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
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