Added Moar Batteries :)

Change-Id: I98082cdccf5cfddbc8602ee7640a5f32bafaf79b

Conflicts:
	res/values/arrays.xml
Merge branch 'jb-mr2' of https://github.com/IOKP/packages_apps_ROMControl into jb-mr2