KAJDASDAIODA
Merge remote-tracking branch 'remotes/origin/THEME'

Conflicts:
	ProjectNom/bin/AndroidManifest.xml