added some stuff to Gui
Merge branch 'master' of ssh://github.com/MattiasHagelin/ChattClient