Fixed time ago. Added more translations.
Merge branch 'master' of https://github.com/nmontesdeoca/cargas-client
Fixed settings headings to be the same as those in overview
Merge branch 'pablosca-master'
units convertion, add consumption to units