Add battery options, clock options (Day, AM/PM, right, center, hide), battery text and battery bar options

Conflicts:
	core/java/android/provider/Settings.java