Merge branch 'gulpjs'
Changed directory urls
Merge branch 'master' into gh-pages