Test
test
Merge branch 'master' of https://github.com/dkiechle/ServiceRoboter

Conflicts:
	src/horst/Map.java