update dist folder
fixup gh-pages
fixup merge conflict
Merge remote-tracking branch 'origin/master' into gh-pages