Merge branch 'master' of https://github.com/simonhmadsen/PP2014-Wifipositioning

Conflicts:
	example/ModelPositionEstimater.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	example/model_FP_NN.java
Merge branch 'master' of https://github.com/simonhmadsen/PP2014-Wifipositioning

Conflicts:
	example/ModelPositionEstimater.java