updating gh-pages to latest
Merge branch 'gh-pages'