Sync yesterday
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
Nullpointer Fixes