WIP - data models
Merge branch 'master' of github.com:android1989/TravelSxSW
Updating data source.
Merge remote-tracking branch 'origin/master'
Fixed merge conflicts.