merged master and made navigation compatible

1 job for navigation in 4 minutes and 15 seconds (queued for 4 seconds)