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

Conflicts:
	AndroidManifest.xml
new resource strings
Merge branch 'master' into ice-cream-sandwich
Z => S
Merge branch 'master' into ice-cream-sandwich
new auth actions
code simplification
cleanup
Merge branch 'master' into ice-cream-sandwich