catching up
Merge branch 'master' of https://github.com/borand/universal-sensor
started to rework the models