GUI
Merge branch 'master' of http://github.com/leedam01/softproj-zhaw