Refactor ViewModels
Merge branch 'master' of github.com:mweibel/mste-testat