Delete test commit
Merge branch 'LasseLegaard'

Conflicts:
	AndroidManifest.xml
Delete commit
Merge branch 'ToreKjaer'

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