deleted WifiDemo
Merge branch 'tcuje' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into tcuje
merge tcuje
Merge branch 'michael' into tcuje
bugfix, removed Wavi
Merge branch 'tcuje' into dev
Merge branch 'location' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into location
Merge branch 'dev' into location
Merge branch 'location' into dev