Merge branch 'gulpjs'
Add dist
Merge branch 'master' into gh-pages