Merge branch 'dev-nico' of git@git.list.lu:nui/TULIP-CPS.git into

dev-nico

Conflicts:
	CPS/src/lu/list/itis/dkd/tui/marker/builder/BaseInfoMarkerBuilder.java

CPS/src/lu/list/itis/dkd/tui/marker/builder/BaseInfoMarkerBuilder.java

@@ -92,6 +92,8 @@ public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>>
         }
     }
 
+
+
     // ---------------------------------------------------------------------------
     // ***************************************************************************
     // * Class Body *