merge gh-pages with master