Updating GUI and Universe.cs
Merge branch 'GUI_0.2' into dev