Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1866

o2web/gulpfile.js

@@ -602,7 +602,7 @@ gulp.task("cleanAll", getCleanTask('/'));
 
 gulp.task("o2:new-v:html", function () {
     var path = "x_desktop";
-    var src = options.dest +'/x_desktop/*.html';
+    var src = '/source/x_desktop/*.html';
     var dest = options.dest + '/x_desktop/';
     return gulp.src(src)
         .pipe(assetRev())