fix the build
Merge branch 'master' into gh-pages
serve from dev dir
Merge branch 'master' into gh-pages