fixed game and merged by hand
Added missing method
Merge branch 'master' of github.com:zombiepaladin/Awe into MergeTest

Conflicts:
	Editor/Controls/EditorViewerControl.cs
Updated to fix again.
Merge branch 'master' of github.com:zombiepaladin/Awe into MergeTest

Conflicts:
	Editor/Controls/EditorViewerControl.cs
Update EditorViewerControl.cs
Merge branch 'master' of github.com:zombiepaladin/Awe into MergeTest

Conflicts:
	Editor/Controls/EditorViewerControl.cs
Quick fix
Got voxel terrians working but not correctly
One last change.