HALO (2/2)

Conflicts:
	AndroidManifest.xml
	res/xml/preference_headers.xml

Conflicts:
	AndroidManifest.xml
	res/values/bk_arrays.xml
	res/values/bk_strings.xml
Notification ROW Transparency (2/2)
PA PIE (2/2)

Conflicts:
	AndroidManifest.xml
PA PIE : Remove QS button for now
PA PIE : add intent of navbar hide
Gesture Anywhere (2/2)

Conflicts:
	AndroidManifest.xml
Set Statusbar Carrie to Default on
Suspend Action (2/2)

Conflicts:
	AndroidManifest.xml
	res/values/bk_strings.xml

Conflicts:
	AndroidManifest.xml
Wakelock Blocker (2/2)

Conflicts:
	AndroidManifest.xml
Fix Gesture not saving
Statusbar AutoHide (2/2)