Fix crash when videoView to remove in android
Update controller.lua for CocosIDE’s need
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
- Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the
 cached value, very helpful on Android platform: when context is lost, the application will reset - rebuild - recache all it's shaders.
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
Add UI Editor test case for Lua
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary
Add a newline
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]