fix settings
Power Widget (2/2)

Conflicts:
	AndroidManifest.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/rootbox_settings.xml

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/display_settings.xml