Updated Navigation, Scrolling and Anchors
Merge branch 'master' into gh-pages