Follow crdroid changes Revert:
QS tiles custom background
Settings: Fix QuickSettings Style NPE
Extended QS options

Thanks to @cristianomatos for the changes
QS: Make it possible to show smaller tiles (2/2)

Change-Id: I19e7f3fb4c1b0e2bcae14942eb98e039cec46d67

Conflicts:
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml

Conflicts:
	res/xml/quick_settings_panel.xml
	src/com/android/settings/quicksettings/QuickSettings.java
Revert "Add Music Tile (2/2)"

This reverts commit ae5494abd0b1387622305a155a1ab84dd015ecc5.
Settings: Fix missing preference when lockscreen disabled.

    - Introduced in security settings reshuffle.

Change-Id: I1b6b608682208396d5efc54fd985652f65e86ffc
Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into android-4.4