Merge pull request #1 from nemomobile/master

Merge from upstream
[battery] Added new plugin batterytracker

Signed-off-by: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>
Fix tabs
Merge pull request #23 from plundstr/master

New plugin batterytracker