UI update
Merge
Merge
Merge
merge
Merge branch 'master' of https://github.com/Whitebeard86/Enox-Raytracer

Conflicts:
	Enox.WinForms/MainWindow.Designer.cs