Merge pull request #98 from enviroCar/dev

Merge latest updates from dev branch
Merge branch 'master' of https://github.com/matthesrieke/enviroCar-www