Moved all gui elements to GUIManager
concluded merge
Merge remote-tracking branch 'origin/master' into Martin