Merge branch 'location' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into location
Merge branch 'dev' into location
Merge branch 'location' into dev