Update controller.lua for CocosIDE’s need
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
Update bindings-generator submodule
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ)
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
Update bindings-generator submodule
closed #5589
fix listView item click move
fix listView Item move respond to click event
Merge branch 'v3' into fixTouchEvent

Conflicts:
	cocos/ui/UIWidget.cpp
fixed #4693: override addChild by name
closed #5591, fix UIButton setTitleColor & getTitleColor not match
Merge pull request #7196 from andyque/issue5591

closed #5591, fix UIButton setTitleColor & getTitleColor not match
[ci skip]
dimiss ListView focus tests
Merge pull request #7194 from andyque/fixTouchEvent

fix touch related issue
add todo to reminder me
[ci skip]
Merge pull request #7197 from andyque/dimissListViewFocus

dimiss ListView focus tests