use 2x (retina) logo for nav
Merge branch 'master' into gh-pages