Fix multiple widget update
Merge branch 'master' into ics

Conflicts:
	taskwidget/AndroidManifest.xml