Merge branch 'Davey' of https://github.com/MikevanLoe/IndoorNav into Wietsee
Merge branch 'Wietsee' of https://github.com/MikevanLoe/IndoorNav into Davey
Map update