major update

html/css/js
Merge branch 'master' into gh-pages