debug
Merge branch 'master' of https://github.com/tdmsolutions/mitsubarender

Conflicts:
	src/MitsubaRender.suo
	src/MitsubaRender/obj/Debug32/DesignTimeResolveAssemblyReferencesInput.cache