Clean up battery style and color picker

Conflicts:
	res/values/beergang_strings.xml
	res/xml/beerbar_settings.xml
	res/xml/beergang_battery_style.xml
	res/xml/status_bar_settings.xml

	modified:   res/values/kow_strings.xml
	deleted:    res/xml/battery_style.xml
	modified:   res/xml/status_bar_settings.xml
	modified:   src/com/android/settings/kowAOSP/BatteryIconStyle.java
	modified:   src/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java
	modified:   src/net/margaritov/preference/colorpicker/ColorPickerDialog.java
	modified:   src/net/margaritov/preference/colorpicker/ColorPickerPanelView.java
	modified:   src/net/margaritov/preference/colorpicker/ColorPickerPreference.java
	modified:   src/net/margaritov/preference/colorpicker/ColorPickerView.java
	res/xml/kowAOSP_battery_style.xml
	new file:   res/xml/kowAOSP_battery_style.xml