Fixed navbar and content top margin.
Merge branch 'master' into gh-pages