second prototype ready for testing
Merge branch 'catarina' of https://github.com/apps8os/trafficsense into catarina
Merge branch 'master' into catarina