version => 2.1.6
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into yotabeta
Merge branch 'yota2' into yotabeta