123
Merge branch 'master' of https://github.com/zpx/foxtech

Conflicts:
	Bin32/Data/GameData/Materials/Default.mtl
	Bin32/Data/GameData/Materials/Illum.mtl
	Code/Tools/Editor/Material/MaterialEditor.xaml
	Code/Tools/Editor/PathViewModel.cs