Removed 'About' from nav as it's no longer necessary
Merge branch 'dev'