Adapt code to new layout
Merge branch 'master' of https://github.com/23Skidoo/5dv020 into HEAD

Conflicts:
	client/src/ChatGui.scala
	client/src/DebugGUI.scala
WIP
No longer extend traits.
minor tidbits
fix missing file
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
Merge pull request #6 from bernilsson/FixGui

Fix gui