test
test
removing malmo branch files from master
search entry placeholder instead of manual tjofräs
Merge branch 'master' into malmo_stadsatlas

Conflicts:
	index_malmoatlas.html