gui changes
Merge branch 'master' of git@github.com:gruppe28/fp2014.git