Add back hardware key settings.

Change-Id: I925fd9d9c02b86d8e93c8b9e25870433f7c20bde

Conflicts:
	src/com/android/settings/Utils.java
Add back navigation bar customization.

Change-Id: I6431a611f3107fd1022df11362d1d2aa27b2f436

Conflicts:
	src/com/android/settings/Utils.java
Add back navigation ring customization.

Patchset 6 : Hide nav bar category on devices without nav bar

Change-Id: Iec29417ab65efc8df593508204b0981d5b193b74

Conflicts:
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
Settings : Port lockscreen shortcut configuration

Port lockscreen configuration from cm-10.2

Conflicts:
        res/values/cm_strings.xml

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/LockscreenTargets.java
miss merge

Change-Id: Ia077fc5300901efce7d939726503970e71331eb3