merge master and gh-page: update master branch