Merge remote-tracking branch 'DAVA/feature-new-materials' into feature-new-materials

Conflicts:
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Sources/Internal/Base/BaseObject.cpp
	Sources/Internal/Base/HashMap.h
	Sources/Internal/Base/Introspection.h
	Sources/Internal/Base/IntrospectionBase.h
	Sources/Internal/Base/IntrospectionCollection.h
	Sources/Internal/Base/IntrospectionProperty.h
	Sources/Internal/FileSystem/VariantType.cpp
	Sources/Internal/FileSystem/VariantType.h
	Sources/Internal/Particles/ParticleEmitter.cpp
	Sources/Internal/Render/Highlevel/RenderBatch.cpp
	Sources/Internal/Render/Highlevel/RenderObject.h
	Sources/Internal/Scene3D/DataNode.h
	Sources/Internal/Scene3D/ParticleEmitterNode.cpp
	Tools/ResourceEditor/Classes/Qt/Main/QtUtils.cpp
	Tools/ResourceEditor/Classes/Qt/Main/QtUtils.h
	Tools/ResourceEditor/Classes/Qt/QtPropertyEditor/QtPropertyData.h
	Tools/ResourceEditor/Classes/Qt/QtPropertyEditor/QtPropertyWidgets/QtColorLineEdit.cpp
	Tools/ResourceEditor/Classes/Qt/QtPropertyEditor/QtPropertyWidgets/QtColorLineEdit.h
	Tools/ResourceEditor/Classes/Qt/QtPropertyEditor/QtProperyData/QtPropertyDataDavaVariant.cpp
	Tools/ResourceEditor/Classes/Qt/QtPropertyEditor/QtProperyData/QtPropertyDataDavaVariant.h
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters