logo is updated
basic html and tabs are fixed
Merge branch 'master' into gh-pages