version 2 of diagram, complete, but have to be checked and corrected
Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team7