Updated gulp and gulp-* versions
Merge branch 'develop'