Feature #4977: Add CCEventListenerAssetsManager.h to cocos-ext.h
Merge branch 'v3_assets_manager' of git://github.com/cocos2d-html5/cocos2d-x into v3_assets_manager
Merge pull request #35 from pandamicro/v3_assets_manager

Improve AssetsManager logic
Feature #4977: Refactor some API
Merge pull request #37 from cocos2d/v3

Sync Cocos2d-x to v3.1
Merge branch 'v3_assets_manager' of git://github.com/cocos2d-html5/cocos2d-x into v3_assets_manager
Merge pull request #1 from pandamicro/v3_assets_manager

Sync Cocos2d-x v3.1
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into AssetManager

Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
Merge commit 'refs/pull/44/head' of https://github.com/dumganhar/cocos2d-x into lua-vm

Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp