Merge branch 'gh-pages'
switch between fixed bar height and not
Merge branch 'master' into gh-pages