navbar is static on smaller screens
Merge branch 'master' into gh-pages