Add battery options, clock options, battery text, battery bar and color picker

Conflicts:

	res/values/demented_strings.xml
	res/xml/settings_headers.xml
build fixes