VERSION => 2.2 beta 4
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml