resources cleanup
Merge branch 'master' into cover_transfer_and_saving
minor update

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