Merge pull request #736 from pandamicro/develop

Fix bugs
Update html5 engine
Issue #5824: Add ccui.TextField#setString in JSB
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop