removed html5 urls due to sub directory
Merge branch 'master' into gh-pages
rebuild