Model updates
Merge branch 'master' of github.com:prattsj/rider-server