adding back the build dir for gh-pages to work
Merge branch 'master' into gh-pages