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

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

Conflicts:
	example/ModelPositionEstimater.java