Merge branch 'dev' into tcuje
Merge branch 'dev' into tcuje
added getScans() for location, added LocationResult class
Merge branch 'tcuje' into dev