Update routing screen models to match what the api is going to give and take
Merge branch 'develop-frontend' into feature/issue-337-change-routing-screen-models-to-match-api