Merge branch 'dev' into tcuje
location, ScanError updates
Merge branch 'dev' into tcuje
added getScans() for location, added LocationResult class
Merge branch 'tcuje' into dev
renamed Map to Floor, refactored DB import
finished database import
Merge branch 'tcuje' into dev
import bugfixes
Merge branch 'tcuje' into dev
Merge remote-tracking branch 'origin/dev' into michael