Fix Custom navbar!

Conflicts:
	res/values-es/ras_strings.xml
	res/values/ras_strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/narp/NavBar.java