Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
6/2 navbar check 2
Merge branch 'master' into gh-pages
6/2 navbar check 3
Merge branch 'gh-pages'