Converted to GulpJS workflow
Merge branch 'gulpjs'