nowrap to navbar
navbar nowrap
Merge branch 'master' into gh-pages
redo changes