Feature/exercise new model

Merged Martin Schneider requested to merge feature/exercise-new-model into master

Merge request reports