merge gh-pages back to master