Merge pull request #24 from cocos2d/v3

Sync Cocos2d-x v3
Update plugin
Merge pull request #25 from pandamicro/v3

Update plugin
Merge pull request #26 from cocos2d/v3

Sync Cocos2d-x v3
Update cocos2d-console
Merge pull request #27 from pandamicro/BeforeMergeGUI

Update cocos2d-console
Sync cocos2d-x v3
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into v3
Merge pull request #28 from pandamicro/v3

Sync Cocos2d-x v3
Fixed #5195: Fix issues for jsb compilation on android platform
Merge pull request #29 from pandamicro/v3

Fixed #5195: Fix issues for jsb compilation on android platform
Merge pull request #30 from cocos2d/v3

Sync Cocos2d-x v3
Merge pull request #31 from pandamicro/AssetManager

Add assets manager to Cocos2d-JS
Merge branch 'AssetManager' into v3_assets_manager
Make constructors public
Merge branch 'v3_assets_manager' of git://github.com/cocos2d-html5/cocos2d-x into v3_assets_manager
Merge pull request #32 from pandamicro/v3_assets_manager

Fix bugs and improve AssetsManager and its test case
Feature #4977: Improve AssetsManager logic
Feature #4977: Fix issue of test case that progress doesn't exist in callback