merge
Revert "merge"

This reverts commit 34cff9e42bbb7cea8899923e4ce20fc7b88088b1.
test löschen
new version of nearest neigbour
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	conf.xml
	src/main/java/de/hsbremen/kss/App.java
	src/main/java/de/hsbremen/kss/construction/TestNearestNeighbor.java
fix some problems