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
Add UI Editor test case for Lua
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary
Add a newline
[ci skip]
[AUTO]: updating luabinding automatically
Merge pull request #7198 from CocosRobot/update_lua_bindings_1403676931

[AUTO]: updating luabinding automatically
Merge pull request #7193 from samuele3hu/v3_ui_binary

Add UI Editor test cases for Lua
[ci skip]
Merge pull request #7156 from samuele3hu/v3_keypad_fix

Update controller.lua for CocosIDE’s need
Merge pull request #7186 from billtt/v3_fixNodeSetScale

fix a bug that Node::setScale(float) may not work properly
[ci skip]