Merge datamodel branch

Lets merge the datamodel back into dev as the other groups should have a continuous view on the this specific topic. Further work should be commitet to the dev branch...