to resolve nav issues - not working still
Merge branch 'master' into gh-pages