Battery percentage (2/2)

Conflicts:
	res/values/strings.xml~
	res/xml/display_settings.xml
	res/xml/display_settings.xml~
	src/com/android/settings/DisplaySettings.java~
NavigationBar: Custom height (2/2) - credits rascarlo