more widget fixes...

Conflicts:
	AndroidManifest.xml