merged master and made navigation compatible

1 job for navigation in 4 minutes and 15 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Build
passed assembleDebug #5217

00:04:15