Fix: Circlebattery has additional docking battery indicator

As pointed out by Aaron Echols, i forgot about docking batteries.
This patch adds an aditional circle, if a docking battery is attached.

Aaron pointed out, this is important for 10.0.1 release

This patch also fixes a small xml screw up, which created a problem on really high densities.

Patchset 2: Switched position of batteries and cleaned up the code accordingly
Patchset 3: Minor fix of wrong variable name

Change-Id: I2b437bac3428362f3865110d4bb08fad1e5f078c