Revert "derp"

This reverts commit e35bbb06b6eb385dafa2b9bc370aca8a55c1a929.
Revert "Fix Battery % settings"

This reverts commit 8e4e26ff2c9d8e4ed45344273d15ff3bec032011.

Conflicts:
	res/xml/status_bar_settings.xml
Revert "Add battery level text to status bar (2/2)"

This reverts commit 42a2de4b0844a6c61e57b0e1d60822d2455c554a.
Battery text mode (2/2)

Change-Id: I13bdf2236811f535b0ac324b5b78c0ab12f365a6
Signed-off-by: kecinzer <kecinzer@gmail.com>

Conflicts:
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml