more widget fixes...

Conflicts:
	AndroidManifest.xml
old widget fix

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
merge conflict fix