Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Präsentation
Präsentation
button gebaeude, etagenwechsel
deletebutton doubleTap fix
clear conflict
solve conflict
bug fix
accuracy fix
Merge branch 'dev' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into dev
this fixt
Merge branch 'dev' into chose-points
Kartenanleitung
Merge branch 'chose-points' into dev
Merge branch 'dev' into chose-points
#15, 26
Merge remote-tracking branch 'origin/dev' into michael
minor bugfixes, short toast