version => 2.1.6
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml