fix rapidjson move semantics bug in assets manager
Merge pull request #38 from pandamicro/v3_assets_manager

Feature #4977: Refactor some API
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into v3_assets_manager

Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	extensions/cocos-ext.h
Merge pull request #36 from joshuastray/v3_assets_manager

fix rapidjson move semantics bug in assets manager
Merge branch 'v3_assets_manager' of git://github.com/cocos2d-html5/cocos2d-x into v3_assets_manager
Feature #4977: Remove parseJSON function
Merge branch 'v3_assets_manager' into AssetManager
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into AssetManager

Conflicts:
	extensions/assets-manager/AssetsManager.cpp
	extensions/assets-manager/Downloader.cpp
Feature #4977: Add thread pool file into js-tests project for iOS Mac
Merge pull request #45 from pandamicro/AssetManager

Fix rapidjson move semantics bug in assets manager