Continue with mvc refachtoring
Merge tommis changes.
Merge branch 'dev' of https://github.com/OlafRadicke/peruschim_cpp into dev