WIP
No longer extend traits.
minor tidbits
Fix merge mistakes
Merge branch 'FixGui' of github.com:bernilsson/5dv020 into FixGui

Conflicts:
	client/src/DebugGUI.scala