Merge branch 'maverick' into develop

Compile under OSX

SICSmain.c

@@ -91,9 +91,10 @@ int main(int argc, char *argv[])
     printf("Unrecoverable error on server startup, exiting.........\n");
     exit(1);
   }
+    /*
   if (daemonize == 1)
     daemon(1, 1);
-
+*/
 
   RunServer(pServ);