html5 and css revision
Merge branch 'master' into gh-pages