Added Circle battery from CyanogenMod, but added more custom colour options, including text color, style, charging, etc.

Also tidied up the Battery Meter one also, as it was running asignments to variables in the draw method, which is unnecessary - note to self, write cleaner code the first time.