Bring quicksettings inline with cm
Merge branch 'jellybean' of github.com:BAM-Team/android_packages_apps_Settings into jellybean