2.1.1
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml