Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread