Merge remote-tracking branch 'origin/dev' into dev

Author: Remi-Gau

setParameters.m

@@ -138,7 +138,7 @@
     cfg.target.type = 'fixation_cross';
     % 'fixation_cross' : the fixation cross changes color
     % 'static_repeat' : static dots are in the same position as previous trials
-    
+
     cfg.fixation.colorTarget = cfg.fixation.color;
     if strcmp(cfg.target.type, 'fixation_cross')
         cfg.fixation.colorTarget = cfg.color.red;