Nya klasser
Merge branch 'domain-model' into develop