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

Conflicts:
	res/xml/settings_headers.xml