Created navigation pane; no hyperlinks on it yet.
fixed conflicts
Merge branch 'jduga002-master'

fixed conflicts