Added fixed navigation, updated favicon
Merge branch 'master' into gh-pages