fixed ui action will be wrong while loop play
resloved merge error
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
hot fix：fix cpp template on IOS version
hot fix：fix lua template on IOS version
hot fix：fix hello lua can not link on IOS
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
hot fix：fix test lua can not link on IOS
Fix javascript template project compile fail.
fix some error for studio binding.
Merge pull request #4217 from Dhilan007/master

[ci skip]Fix javascript template project compile fail.
Merge pull request #4218 from dabingnn/masterfix

[ci skip]Masterfix
Merge pull request #4219 from Dhilan007/master

[ci skip]fix some error for studio binding.
replace nullptr to NULL
fix miss file for jsb XCode project and relieve depend on studio binding.
Merge pull request #4223 from Dhilan007/master

[ci skip]fix miss file for jsb XCode project and relieve depend on studio binding...
Merge pull request #4216 from liamcindy/master

[ci skip]fixed animation play error for master
[master] Update auto-generated binding code manually.
Merge pull request #4225 from dumganhar/master

[master] Update auto-generated binding code manually.