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

Conflicts:
	bin/wifipositioning/FingerPrintingNN.class
	src/wifipositioning/FingerPrintingNN.java
dsadsa
Merge branch 'master' of https://github.com/Hagbarth/LocUtil