Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed Armature::getBoundingBox() is wrong when bone's display is null
fix mingw32/64 build:

MinGW uses system installed libcurl, rather than libcurl_imp.
set libws2_32 as standard library for mingw.
* Skip UTF8 BOM if it exists
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
Bug fix
Add bytecode and encrypted files test cases for Lua
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
fix KeyCode back compatible
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Update controller.lua
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
add TimelineAction
issue #4693: add getName(), setName() and getChildByName()
support relative path for reading json
add AsyncReader
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

Conflicts:
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp