merging GUIManager
Merge branch 'master' of github.com:MartinSkytte/eTD