fix CCString to lua string

rt
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
[AUTO] : updating submodule reference to latest autogenerated bindings
updating js shared submodule reference
Merge pull request #4292 from CocosRobot/updategeneratedsubmodule_1384750868

[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4299 from Dhilan007/master

[ci skip]updating js shared submodule reference
Merge pull request #3950 from linguofeng/patch-1

[ci skip]fix CCString to lua string
sync constant from h5
Merge pull request #4311 from Dhilan007/master

[ci skip]sync constant from h5
Merge pull request #4296 from liamcindy/master

[ci skip]Shielded unusefull log
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
fix if last frame has tween effect, the display may not right
[Sync from develop branch]closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes.
Merge pull request #4327 from dumganhar/httpclient-crash-master

[ci skip][Sync from develop branch]closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes.
Revert "Merge branch 'master' of https://github.com/cocos2d/cocos2d-x"

This reverts commit 75ad83ea0a2b98aa4f21170c7442b489aa176f5b, reversing
changes made to 245c1db293271c03452111d538353e56db216f65.
Merge pull request #4329 from 2youyouo2/master

[ci skip]fix if last frame has tween effect, the display may not right
replace nullptr to NULL
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x