Updated Domain Model
Merge branch 'master' of https://github.com/thomasbaart/csi-percurrentis