merge master and beta into gh-pages