Update Reference plugin-x
Update Reference for template
Update reference to plugin
Update reference plugin-x
fix cmakelists.txt of linux platform
Merge branch 'v3' into fixLinuxCompileError
add box2d tinyzml back
fix linux compile error
Scale9Sprite improvements
small bugs fix
small optimizations
support for cropped sprite frames
Scale9Sprite cropped frames tests
Misprint fix
scale9Image double draw fix
New Audio Engine[Win32]
Improved thread safety
update configuration for resource dependence
fix bug: physics crashes when remove/add children too quick.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32

Conflicts:
	cocos/audio/AudioEngine.cpp
	cocos/audio/apple/AudioPlayer.h
	cocos/audio/include/AudioEngine.h
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
fix macro
fix macro
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32

Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
Merge pull request #8214 from SunLightJuly/fix_lua_loader

Fix lua loader