Index: branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config	(revision 11204)
+++ branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config	(revision 12395)
@@ -2,15 +2,15 @@
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <runtime>
-    <gcServer enabled="true" />
+    <gcServer enabled="true"/>
   </runtime>
 
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
   </startup>
  
@@ -26,9 +26,9 @@
       <wsHttpBinding>
         <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
-            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
@@ -36,9 +36,9 @@
       <netTcpBinding>
         <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
-          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="TransportWithMessageCredential">
-            <transport clientCredentialType="Windows" />
-            <message clientCredentialType="UserName" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows"/>
+            <message clientCredentialType="UserName" algorithmSuite="Default"/>
           </security>
         </binding>
@@ -52,12 +52,12 @@
     <client>
       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-      <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+      <endpoint address="http://localhost/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU="/>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/>
         </identity>
       </endpoint>
-      <endpoint address="net.tcp://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+      <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
+          <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9" />
         </identity>
       </endpoint>
@@ -83,10 +83,4 @@
       <setting name="PluginInfrastructureDll" serializeAs="String">
         <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
-      </setting>
-      <setting name="SharpZipLibDll" serializeAs="String">
-        <value>ICSharpCode.SharpZipLib.dll</value>
-      </setting>
-      <setting name="SharpZipLibLicense" serializeAs="String">
-        <value>ICSharpCode.SharpZipLib License.txt</value>
       </setting>
       <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
@@ -166,6 +160,5 @@
       <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
         <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
             <string>netTcpBinding_IHiveService</string>
             <string>wsHttpBinding_IHiveService</string>
