Delete commit
Merge branch 'ToreKjaer'

Conflicts:
	AndroidManifest.xml