Merge pull request #98 from enviroCar/dev

Merge latest updates from dev branch
Merge pull request #99 from enviroCar/master

Create new commit baseline
Merge branch 'dev' of https://github.com/matthesrieke/enviroCar-www into dev