Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
[Jenkins] watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins] watchdog
[Jenkins] watchdog
EditBox:fixes clip the text width to fit to the text box on Android and IOS.
Merge pull request #14 from cocos2d/develop

update lua
modify module_path
Fixed bug of ScrollView
Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Iss4277_fixedControlButtonBug
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
remove node name related features from v3.0
Merge pull request #5744 from dingpinglv/Iss4277_fixedControlButtonBug

Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback.
Update CHANGELOG [ci skip]
Merge pull request #5742 from chuanweizhang2013/luamerage

fixed template android build errors
Merge pull request #5741 from nutty898/develop_nutty_modify_framework_for315CrashFixed

[UI] Potential crash in cocos2d::ui::ScrollView.
Merge pull request #5743 from heliclei/remove-node-name

remove node name related features from v3.0