Testing a Merge fix

src/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs

@@ -58,6 +58,7 @@ namespace EveOPreview.Configuration.Implementation
 			this.EnableClientLayoutTracking = false;
 			this.HideActiveClientThumbnail = false;
 			this.MinimizeInactiveClients = false;
+			this.MinimizeInactiveClientsAnimation = false;
 			this.ShowThumbnailsAlwaysOnTop = true;
 			this.EnablePerClientThumbnailLayouts = false;
 
@@ -73,14 +74,23 @@ namespace EveOPreview.Configuration.Implementation
 			this.ThumbnailZoomEnabled = false;
 			this.ThumbnailZoomFactor = 2;
 			this.ThumbnailZoomAnchor = ZoomAnchor.NW;
+            this.OverlayLabelAnchor = ZoomAnchor.NW;
 
-			this.ShowThumbnailOverlays = true;
+            this.ShowThumbnailOverlays = true;
 			this.ShowThumbnailFrames = false;
+			this.LockThumbnailLocation = false;
 
-			this.EnableActiveClientHighlight = false;
+			this.ThumbnailSnapToGrid = true;
+			this.ThumbnailSnapToGridSizeX = 100;
+			this.ThumbnailSnapToGridSizeY = 50;
+
+            this.EnableActiveClientHighlight = false;
 			this.ActiveClientHighlightColor = Color.GreenYellow;
 			this.ActiveClientHighlightThickness = 3;
 
+			this.OverlayLabelColor = Color.Orange;
+			this.OverlayLabelSize = 10;
+
 			this.LoginThumbnailLocation = new Point(5, 5);
 		}
 
@@ -134,6 +144,7 @@ namespace EveOPreview.Configuration.Implementation
 
 		public bool HideActiveClientThumbnail { get; set; }
 		public bool MinimizeInactiveClients { get; set; }
+		public bool MinimizeInactiveClientsAnimation { get; set; }
 		public bool ShowThumbnailsAlwaysOnTop { get; set; }
 
 		public bool EnablePerClientThumbnailLayouts
@@ -163,14 +174,20 @@ namespace EveOPreview.Configuration.Implementation
 		public bool ThumbnailZoomEnabled { get; set; }
 		public int ThumbnailZoomFactor { get; set; }
 		public ZoomAnchor ThumbnailZoomAnchor { get; set; }
+		public ZoomAnchor OverlayLabelAnchor { get; set; }
 
 		public bool ShowThumbnailOverlays { get; set; }
 		public bool ShowThumbnailFrames { get; set; }
+		public bool LockThumbnailLocation { get; set; }
+		public bool ThumbnailSnapToGrid { get; set; }
+		public int ThumbnailSnapToGridSizeX {  get; set; }
+		public int ThumbnailSnapToGridSizeY { get; set; }
 
 		public bool EnableActiveClientHighlight { get; set; }
 
 		public Color ActiveClientHighlightColor { get; set; }
-
+		public Color OverlayLabelColor { get; set; }
+		public int OverlayLabelSize {  get; set; }
 		public int ActiveClientHighlightThickness { get; set; }
 
 		[JsonProperty("LoginThumbnailLocation")]