changed class diagram
bugfix
Merge branch 'master' of https://github.com/bruggi/SysProg-WS2013-2014