[2/2] Setting: notification panel header - Derp
Add an option to enable/disable the Navigation Bar (2/2)
[2/2]settings : Quick swipe
Performance Settings: Remove ZRAM option

For more info: https://github.com/CyanogenMod/android_packages_apps_Settings/commit/f4002997b0177183311b6efe3e5ec5fe7d9703a2

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	src/com/android/settings/cyanogenmod/MemoryManagement.java
Settings: Use solid actionbar

When the action bar is visible, use the solid holo dark theme used
 by the rest of the Settings app

Change-Id: I41deeaa1988d59e121e6e81bcf3f42c570341f0b

Conflicts:
	AndroidManifest.xml
Merge branch 'kitkat-test' into kitkat-themes

Conflicts:
	res/values/pa_strings.xml
	res/xml/more_device_settings.xml
	src/com/android/settings/cyanogenmod/MoreDeviceSettings.java