VERSION => 2.2 beta 3

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml