merge the master branch's changes to gh-pages