fix
Merge branch 'master' of https://github.com/aokman/Erya3D

Conflicts:
	Engine/Resource/AssetPipeline/RenderTexture2DPipeline.cpp
	Engine/Resource/AssetPipeline/RenderTexture2DPipeline.h
	Engine/Resource/AssetPipeline/XmlUtilities.h