merge
mergefix
Merge branch 'Mike' of https://github.com/MikevanLoe/IndoorNav into Davey
Reader Changes
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
conflict fix