Navigation bar buttons customization
Circle Battery

Use a new preference category for battery options
Enable native battery percentage only if icon style is set
Merge remote-tracking branch 'rascarlo/kk-ras-mr1' into faithcry

Conflicts:
	src/com/android/settings/rascarlo/NavBar.java