Doc #5829: Match shaderProgram getter/setter functions in JSB
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