[DF-2992] bug fixes
Merge branch 'origin/feature-integration-new-materials'

Conflicts:
	Sources/Internal/Render/Material/MaterialSystem.cpp
[DF-2992] structural code changes