Merge branch 'Davey' of https://github.com/MikevanLoe/IndoorNav into Wietsee
Merge branch 'Wietsee' of https://github.com/MikevanLoe/IndoorNav into Davey
Map and design update
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
Merge branch 'Wietsee' of github.com:MikevanLoe/IndoorNav into Mike
Map and design update fix
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
Merge branch 'Wietsee' of https://github.com/MikevanLoe/IndoorNav into Davey
Map update
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
Order fix