minor changes in consumption calculation and maf calculation
minor changes in consumption calculation and maf calculation
modify .gitignore
Merge branch 'refactor-outsource-matthes' of https://github.com/matthesrieke/enviroCar-app into develop
modify gitignore
modify gitignore
Merge branch 'refactor-outsource-matthes' of https://github.com/matthesrieke/enviroCar-app into develop
to merge other stuff
Merge branch 'refactor-outsource-matthes' of
https://github.com/matthesrieke/enviroCar-app into develop

Conflicts:
	android-obd-simulator/.gitignore
fix possible null activity in dashboard
add car object to track
merge gitignore
Merge pull request #5 from janschulte/develop

Develop