Status bar Clock and Battery: ERROR

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/arrays.xml
	res/xml/system_settings.xml