loader
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3

Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3

Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp