Cyanogen Circle Battery - Thanks CyanogenMod (1/2)
Fixed CM circle battery and conflict
Add Dotted Circle Battery (2/2) - SlimBean
[Framework] Add custom circle battery options - SlimBean port

    new slim feature

    - custom circle color
    - custom circle text color
    - custom animation speed
    - compatibel to all themes from theme engine
    - option to reset it to theme behaviour
Fixed cp conflict
Notification: add option to show connected wifi network (1/2) - AOKP
Fixed cp conflict
Revert "Enable Copy/Paste in Google Talk"

This reverts commit 6b5551c8c61578c24e8b1f3cdf35ac0a530232ec.