minimum marker size
Merge branch 'master' of https://github.com/c-esswein/autonom-ps

Conflicts:
	PS2DSelfLocalisation/src/uibk/autonom/ps/navigation/Marker.java