Usermodel fixes
Merge branch 'Create-Equipment-MVVM' of https://github.com/chuckcatron/layouts-views-mvvm into Create-Equipment-MVVM