update master template to grab correct dir in Nav.
Merge remote-tracking branch 'origin/master'