lots of small changes#
Merge branch 'master' of https://github.com/apps8os/trafficsense
Merge branch 'master' into catarina