Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm
Add new AssetManager lua binding
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm

Conflicts:
	tools/tolua/cocos2dx_extension.ini
Add manual lua-bindings for Manifest
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm

Conflicts:
	cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp
	cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.h
Add asset manager  manual lua binding
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm

Conflicts:
	cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp
	extensions/assets-manager/AssetsManager.cpp
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm
Update new AssetManager lua binding
Update cocos2dConstants.lua
Merge pull request #39 from pandamicro/AssetManager

Improve AssetsManager and its test case
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm
Merge pull request #38 from samuele3hu/v3_lua_vm

Add new AssetsManager lua bindings
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm
Merge pull request #40 from pandamicro/AssetManager

Feature #4977: Fix an issue of duplicated release manifest object
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_lua_vm
Update lua bindings for AssetsManager and related test case
Merge pull request #42 from samuele3hu/v3_lua_vm

Update lua bindings for AssetsManager and related test case
Merge commit 'refs/pull/41/head' of https://github.com/dumganhar/cocos2d-x into lua-vm

Conflicts:
	extensions/cocos-ext.h
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into lua-vm