Working on materials
Merge branch 'master' of github.com:tdmsolutions/mitsubarender

Conflicts:
	src/MitsubaRender/Exporter/MitsubaXml.cs