V4.2 with stats and vaxtor settings changes. Fixed merge problems

FakeCamera/FakeCamera.cs

@@ -116,7 +116,7 @@ namespace AiQ_GUI
             if (requiresAuth)
             {
                 string authHeader = context.Request.Headers["Authorization"];
-                                                
+
                 if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Basic "))
                 {
                     context.Response.AddHeader("WWW-Authenticate", "Basic realm=\"FakeCamera\"");