修改
错误修复
.
..
...
Merge branch 'master' of https://github.com/weilichuang/away3dHaxe

Conflicts:
	src/away3d/io/loaders/misc/AssetLoaderToken.as
	src/away3d/materials/passes/SuperShaderPass.as