viewmodels and viewmodeleditor
Merge remote-tracking branch 'origin/wincornixdorf' into wincornixdorf