Moving to model controller
Merge branch 'master' of github.com:florianbuerger/ditte