Index: /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config	(revision 16091)
@@ -150,5 +150,5 @@
     <client>
       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
@@ -157,5 +157,5 @@
         </identity>
       </endpoint>
-      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="NetBinding_IHiveService">
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Slave/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Slave/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Slave/3.3/app.config	(revision 16091)
@@ -150,5 +150,5 @@
     <client>
       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
@@ -157,5 +157,5 @@
         </identity>
       </endpoint>
-      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="NetBinding_IHiveService">
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/app.config	(revision 16091)
@@ -71,5 +71,5 @@
     </bindings>
     <client>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
@@ -78,5 +78,5 @@
         </identity>
       </endpoint>
-      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="NetBinding_IHiveService">
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/ASPNETAuthentication.dbml
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/ASPNETAuthentication.dbml	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/ASPNETAuthentication.dbml	(revision 16091)
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.Authentication" Class="ASPNETAuthenticationDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
-  <Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" SettingsObjectName="HeuristicLab.Services.Access.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_AuthenticationConnectionString" Provider="System.Data.SqlClient" />
+  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" SettingsObjectName="HeuristicLab.Services.Access.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_AuthenticationConnectionString" Provider="System.Data.SqlClient" />
   <Table Name="dbo.aspnet_Applications" Member="aspnet_Applications">
     <Type Name="aspnet_Application">
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs	(revision 16091)
@@ -13,5 +13,5 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -27,6 +27,6 @@
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Ac" +
-            "cessService")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Acces" +
+            "sService")]
         public string HeuristicLab_ClientManagementConnectionString {
             get {
@@ -38,6 +38,6 @@
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Au" +
-            "thentication")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authe" +
+            "ntication")]
         public string HeuristicLab_AuthenticationConnectionString {
             get {
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.settings
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.settings	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.settings	(revision 16091)
@@ -6,16 +6,14 @@
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService</Value>
+      <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService</Value>
     </Setting>
     <Setting Name="HeuristicLab_AuthenticationConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication</Value>
+      <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication</Value>
     </Setting>
   </Settings>
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/app.config	(revision 16091)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+  </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.Access.DataAccess.Properties.Settings.HeuristicLab_ClientManagementConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService" />
-    <add name="HeuristicLab.Services.Access.DataAccess.Properties.Settings.HeuristicLab_AuthenticationConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Services.Access.DataAccess.Properties.Settings.HeuristicLab_ClientManagementConnectionString"
+      connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService" />
+    <add name="HeuristicLab.Services.Access.DataAccess.Properties.Settings.HeuristicLab_AuthenticationConnectionString"
+      connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
   </connectionStrings>
 
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access/3.3/Web.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access/3.3/Web.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access/3.3/Web.config	(revision 16091)
@@ -2,5 +2,5 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
   </connectionStrings>
 
@@ -30,5 +30,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/AccessService-3.3/AccessService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" />
           </baseAddresses>
         </host>
@@ -41,5 +41,5 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Access/3.3/app.config	(revision 16091)
@@ -2,5 +2,5 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
   </connectionStrings>
 
@@ -30,5 +30,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/AccessService-3.3/AccessService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" />
           </baseAddresses>
         </host>
@@ -41,5 +41,5 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Deployment.dbml
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Deployment.dbml	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Deployment.dbml	(revision 16091)
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.PluginStore" Class="DeploymentDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
-  <Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment" SettingsObjectName="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_DeploymentConnectionString" Provider="System.Data.SqlClient" />
+  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment" SettingsObjectName="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_DeploymentConnectionString" Provider="System.Data.SqlClient" />
   <Table Name="dbo.Dependencies" Member="Dependencies">
     <Type Name="Dependency">
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Properties/Settings.Designer.cs
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Properties/Settings.Designer.cs	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Properties/Settings.Designer.cs	(revision 16091)
@@ -13,5 +13,5 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -27,6 +27,6 @@
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.De" +
-            "ployment")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deplo" +
+            "yment")]
         public string HeuristicLab_DeploymentConnectionString {
             get {
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Properties/Settings.settings
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Properties/Settings.settings	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/Properties/Settings.settings	(revision 16091)
@@ -6,8 +6,7 @@
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment</Value>
+      <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment</Value>
     </Setting>
   </Settings>
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment.DataAccess/3.3/app.config	(revision 16091)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+  </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment" />
+    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString"
+      connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment" />
   </connectionStrings>
 
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment/3.3/Web.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment/3.3/Web.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment/3.3/Web.config	(revision 16091)
@@ -2,6 +2,6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>
   </connectionStrings>
 
@@ -40,5 +40,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/Deployment-3.3/AdminService.svc"/>
+            <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/AdminService.svc"/>
           </baseAddresses>
         </host>
@@ -49,5 +49,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/Deployment-3.3/UpdateService.svc"/>
+            <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/UpdateService.svc"/>
           </baseAddresses>
         </host>
@@ -60,5 +60,5 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment/3.3/app.config	(revision 16091)
@@ -2,6 +2,6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>
   </connectionStrings>
 
@@ -40,5 +40,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/Deployment-3.3/AdminService.svc"/>
+            <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/AdminService.svc"/>
           </baseAddresses>
         </host>
@@ -49,5 +49,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/Deployment-3.3/UpdateService.svc"/>
+            <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/UpdateService.svc"/>
           </baseAddresses>
         </host>
@@ -60,5 +60,5 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql	(revision 16091)
@@ -17,5 +17,5 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-USE [HeuristicLab.Hive-3.3]
+USE [HeuristicLab.Hive-3.4]
 
 EXEC sp_configure filestream_access_level, 2
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql	(revision 16091)
@@ -19,5 +19,5 @@
 
 /* this script is supposed to be executed after the plain DB is generated by the linq-to-sql schema */
-USE [HeuristicLab.Hive-3.3]
+USE [HeuristicLab.Hive-3.4]
 
 ALTER TABLE [dbo].[AssignedProjectResource]  DROP  CONSTRAINT [Project_AssignedProjectResource]
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs	(revision 16091)
@@ -13,5 +13,5 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -21,15 +21,4 @@
             get {
                 return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hi" +
-            "ve-3.3")]
-        public string HeuristicLab_Hive_LinqConnectionString {
-            get {
-                return ((string)(this["HeuristicLab_Hive_LinqConnectionString"]));
             }
         }
@@ -52,4 +41,15 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-" +
+            "3.4")]
+        public string HeuristicLab_Hive_LinqConnectionString {
+            get {
+                return ((string)(this["HeuristicLab_Hive_LinqConnectionString"]));
+            }
+        }
     }
 }
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings	(revision 16091)
@@ -3,12 +3,4 @@
   <Profiles />
   <Settings>
-    <Setting Name="HeuristicLab_Hive_LinqConnectionString" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3</Value>
-    </Setting>
     <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application">
       <Value Profile="(Default)">00:05:00</Value>
@@ -17,4 +9,11 @@
       <Value Profile="(Default)">HL.Hive</Value>
     </Setting>
+    <Setting Name="HeuristicLab_Hive_LinqConnectionString" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/app.config	(revision 16091)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+  </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString"
+      connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4" />
   </connectionStrings>
 
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config	(revision 16091)
@@ -23,6 +23,6 @@
   
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4" />
   </connectionStrings>
 
@@ -62,10 +62,10 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
           name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" />
-        <endpoint address="net.tcp://localhost:8001/Hive-3.3/HiveService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc"
           binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
           name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/Hive-3.3/HiveService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" />
           </baseAddresses>
         </host>
@@ -101,5 +101,5 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web/web_services.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web/web_services.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web/web_services.config	(revision 16091)
@@ -25,5 +25,5 @@
     <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
 	 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString"
-      connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;"
+      connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;"
       providerName="System.Data.SqlClient" />
   </connectionStrings>
@@ -118,5 +118,5 @@
         <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="MexTcpEndpoint" contract="IMetadataExchange"/>
         <endpoint address="" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
-        <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding"  bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
+        <endpoint address="net.tcp://10.20.71.54/Hive-3.4/HiveService.svc" binding="netTcpBinding"  bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
       </service>
     </services>
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml	(revision 16091)
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.OKB" EntityNamespace="HeuristicLab.Services.OKB.DataAccess" ContextNamespace="HeuristicLab.Services.OKB.DataAccess" Class="OKBDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
-  <Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" SettingsObjectName="HeuristicLab.Services.OKB.DataAccess.Properties.Settings" SettingsPropertyName="OKBConnectionString" Provider="System.Data.SqlClient" />
+  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" SettingsObjectName="HeuristicLab.Services.OKB.DataAccess.Properties.Settings" SettingsPropertyName="OKBConnectionString" Provider="System.Data.SqlClient" />
   <Table Name="dbo.AlgorithmClass" Member="AlgorithmClasses">
     <Type Name="AlgorithmClass">
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.Designer.cs
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.Designer.cs	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.Designer.cs	(revision 16091)
@@ -2,5 +2,5 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -13,5 +13,5 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -27,6 +27,5 @@
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OK" +
-            "B")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB")]
         public string OKBConnectionString {
             get {
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.settings
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.settings	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.settings	(revision 16091)
@@ -6,8 +6,7 @@
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB&lt;/ConnectionString&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB</Value>
+      <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB</Value>
     </Setting>
   </Settings>
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess/3.3/app.config	(revision 16091)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+  </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" />
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString"
+      connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" />
   </connectionStrings>
 
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB/3.3/Web.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB/3.3/Web.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB/3.3/Web.config	(revision 16091)
@@ -2,6 +2,6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
-    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
   </connectionStrings>
 
@@ -34,5 +34,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/AdministrationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/AdministrationService.svc" />
           </baseAddresses>
         </host>
@@ -41,10 +41,10 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
           name="WSHttpBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
-        <endpoint address="net.tcp://localhost:8001/OKB-3.3/QueryService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/OKB-3.3/QueryService.svc"
           binding="netTcpBinding" bindingConfiguration="DefaultNetBinding"
           name="NetBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/QueryService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/QueryService.svc" />
           </baseAddresses>
         </host>
@@ -55,5 +55,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/RunCreationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/RunCreationService.svc" />
           </baseAddresses>
         </host>
@@ -91,5 +91,5 @@
             roleProviderName="AspNetSqlRoleProvider" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB/3.3/app.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB/3.3/app.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB/3.3/app.config	(revision 16091)
@@ -2,6 +2,6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
-    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
   </connectionStrings>
 
@@ -34,5 +34,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/AdministrationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/AdministrationService.svc" />
           </baseAddresses>
         </host>
@@ -41,10 +41,10 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
           name="WSHttpBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
-        <endpoint address="net.tcp://localhost:8001/OKB-3.3/QueryService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/OKB-3.3/QueryService.svc"
           binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IQueryService"
           name="NetBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/QueryService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/QueryService.svc" />
           </baseAddresses>
         </host>
@@ -55,5 +55,5 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/RunCreationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/RunCreationService.svc" />
           </baseAddresses>
         </host>
@@ -91,5 +91,5 @@
             roleProviderName="AspNetSqlRoleProvider" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />
Index: /branches/2839_HiveProjectManagement/HeuristicLab.Services.WebApp/3.3/Web.config
===================================================================
--- /branches/2839_HiveProjectManagement/HeuristicLab.Services.WebApp/3.3/Web.config	(revision 16090)
+++ /branches/2839_HiveProjectManagement/HeuristicLab.Services.WebApp/3.3/Web.config	(revision 16091)
@@ -4,6 +4,6 @@
     <remove name="HeuristicLab.Authentication" />
     <remove name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" />
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4" />
   </connectionStrings>
   
