merge gh-pages changes to master