Update android manifest
Set km/l fixed
Code style
Merge branch 'master' of github.com:Brunozrk/ContCombOn