update model
Merge remote-tracking branch 'origin/f-configuration-manager' into f-configuration-manager
sync with martin
Merge branch 'f-configuration-manager' of github.com:Invenietis/yodii into f-configuration-manager