new update and bug fix
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
Sync with Laptop
Merge branch 'Davey' of github.com:MikevanLoe/IndoorNav into Mike
Fixed nullPointers