Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Merge branch 'cm-10.2' of https://github.com/TaoSP/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of https://github.com/TaoSP/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of https://github.com/TaoSP/android_packages_apps_Settings into cm-10.2
HALO: Circle, Bubble, text colors.

Credits to Daxxmax