resources cleanup
Merge branch 'master' into beta
minor update

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

Conflicts:
	AndroidManifest.xml