oh shit
Merge branch 'master' of https://github.com/Hagbarth/LocUtil

Conflicts:
	bin/wifipositioning/ModelKNN.class