New data model (under `models2/` folder).
Merge branch 'master' of https://github.com/morteza/tracker