merge branches

gh-pages to master