style(gulpfile.js): improved code formating and syntax
Merge branch 'dev'