HALO colors [2/2]
Add color picker
Update color picker
fix Ariplanemode
Add 2G/3G option to profile connections (2/2)

Only show option when network type is GSM not CDMA

Change-Id: Ib225366c63ae928f23afd5bbe8b5f68818a4976b
Profiles: 2g3g fix merge 1
Merge remote-tracking branch 'origin/jb-mr1-mod' into jb-mr1