gui stuff
more gui changes
Merge remote-tracking branch 'origin/GUI' into BasicSceneInGame