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

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into intro-ics
Merge branch 'intro' into intro-ics
Merge branch 'master' into intro
new resource strings
new resource strings
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'master' into intro
Merge branch 'yota2' into intro-ics
Merge branch 'intro' into intro-ics
Z => S
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'master' into intro
Merge branch 'yota2' into intro-ics
Merge branch 'intro' into intro-ics
new auth actions