Nav Bar + Nav Bar Height

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java
Nav Bar Width in landscape (realtime change)

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml