Test commit
Merge branch 'LasseLegaard'

Conflicts:
	AndroidManifest.xml