use new syntax to combine tasks, gulp.run is deprecated
Merge branch 'master' into angular