VERSION => 2.2
Merge branch 'master' into nook

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