nearest neighbour eingefügt
Merge commit '4bf24dcac6041dc8b125ac374c807a919295aeea' into dev_CB

Conflicts:
	img/elevation.tif
	img/features.tif
	script/generate_map.py