resources cleanup
Merge branch 'master' into nook
minor update

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml