issue #5364: Change setText to setString
Merge pull request #437 from VisualSJ/master

issue #5364: Change setText to setString
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update cocos2d-html5