resources cleanup
Merge branch 'master' into tags-master
minor update

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into tags-master