GuI patch 2.1.1.1
Merge branch 'master' of https://github.com/JonasW91/BachelorProjekt.git