Merge branch 'hotfix/170'

Close #170
Remove conflict file

- Not sure how this ever was committed; removed now
[#162] Ensure navbar fills content to secondary nav

- Added a min-height directive to the primary navbar to ensure that on narrow
  screens, no empty content appears between the primary and secondary navbars.
Rebuilt UI distribution
Merge branch 'hotfix/162' into develop

Forward port #162