Fixing broken project navigation
Merge branch 'master' into gh-pages

* master:
  Fixing broken project navigation