diff --git a/ENI2/App.config b/ENI2/App.config
index c4795a17..4c7c4bc1 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -26,20 +26,17 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-                <value>http://192.168.2.24/LockingService/LockingService.svc</value>
-            </setting>
-            <setting name="ReportAuthor" serializeAs="String">
-                <value>BSMD ReportGenerator</value>
+				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
+				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
     <userSettings>
         <ENI2.Properties.Settings>
             <setting name="MainWindowPlacement" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </ENI2.Properties.Settings>
     </userSettings>
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 3d9a1615..4dde7260 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ENI2</RootNamespace>
-    <AssemblyName>ENI2Test</AssemblyName>
+    <AssemblyName>ENI2</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -18,7 +18,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <PublishUrl>eni_test\</PublishUrl>
+    <PublishUrl>eni_publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -28,9 +28,9 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://192.168.2.24/eni_test/</InstallUrl>
+    <InstallUrl>http://192.168.2.24/eni_publish/</InstallUrl>
     <SupportUrl>http://www.textbausteine.net/</SupportUrl>
-    <ProductName>ENI Testversion</ProductName>
+    <ProductName>ENI</ProductName>
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <SuiteName>NSW</SuiteName>
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
diff --git a/ENI2/EditControls/CompareExcelDialog.xaml b/ENI2/EditControls/CompareExcelDialog.xaml
index e77d7a89..cb7c433e 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml
+++ b/ENI2/EditControls/CompareExcelDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico">
+        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/Eni2;component/Resources/bullet_ball_grey.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />
diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml b/ENI2/EditControls/CopyDeclarationDialog.xaml
index d6e59748..70cc2361 100644
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_cards.ico">
+        Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/Eni2;component/Resources/id_cards.ico">
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
diff --git a/ENI2/EditControls/CoreStatusInfoDialog.xaml b/ENI2/EditControls/CoreStatusInfoDialog.xaml
index b09b092d..4c530ef3 100644
--- a/ENI2/EditControls/CoreStatusInfoDialog.xaml
+++ b/ENI2/EditControls/CoreStatusInfoDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico" >
+        Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/Eni2;component/Resources/bullet_ball_grey.ico" >
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.3*"/>
diff --git a/ENI2/EditControls/EditRulesDialog.xaml b/ENI2/EditControls/EditRulesDialog.xaml
index d18ba960..417e7c5f 100644
--- a/ENI2/EditControls/EditRulesDialog.xaml
+++ b/ENI2/EditControls/EditRulesDialog.xaml
@@ -9,7 +9,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/mail_forward.png"> 
+        Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/Eni2;component/Resources/mail_forward.png"> 
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />
diff --git a/ENI2/EditControls/ErrorListDialog.xaml b/ENI2/EditControls/ErrorListDialog.xaml
index 477f5116..0ac7bd60 100644
--- a/ENI2/EditControls/ErrorListDialog.xaml
+++ b/ENI2/EditControls/ErrorListDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_red.ico" Topmost="False">
+        Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/Eni2;component/Resources/bullet_ball_red.ico" Topmost="False">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
diff --git a/ENI2/EditControls/MessageHistoryDialog.xaml b/ENI2/EditControls/MessageHistoryDialog.xaml
index a4e4f768..19d2bd8c 100644
--- a/ENI2/EditControls/MessageHistoryDialog.xaml
+++ b/ENI2/EditControls/MessageHistoryDialog.xaml
@@ -7,7 +7,7 @@
         xmlns:enictrl="clr-namespace:ENI2.Controls"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2Test;component/Resources/clock_history.ico">
+        Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/Eni2;component/Resources/clock_history.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
diff --git a/ENI2/EditControls/NewDGItemDialog.xaml b/ENI2/EditControls/NewDGItemDialog.xaml
index d1dec33e..3d73c30b 100644
--- a/ENI2/EditControls/NewDGItemDialog.xaml
+++ b/ENI2/EditControls/NewDGItemDialog.xaml
@@ -9,7 +9,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
         Title="{x:Static p:Resources.textNewDGItem}" Height="350" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" 
-                        Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
+                        Icon="/Eni2;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
diff --git a/ENI2/EditControls/NewWithIdDialog.xaml b/ENI2/EditControls/NewWithIdDialog.xaml
index 6dda1383..6abe669c 100644
--- a/ENI2/EditControls/NewWithIdDialog.xaml
+++ b/ENI2/EditControls/NewWithIdDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_add.ico">
+        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/Eni2;component/Resources/id_card_add.ico">
     
         <Grid Margin="4">
         <Grid.RowDefinitions>
diff --git a/ENI2/EditControls/SelectPortAreaDialog.xaml b/ENI2/EditControls/SelectPortAreaDialog.xaml
index 40c24d3e..3fdf09dd 100644
--- a/ENI2/EditControls/SelectPortAreaDialog.xaml
+++ b/ENI2/EditControls/SelectPortAreaDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:local="clr-namespace:ENI2.EditControls"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="Search port area" Height="400" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded">
+        Title="Search port area" Height="400" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" Icon="/Eni2;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
diff --git a/ENI2/EditControls/ViolationListDialog.xaml b/ENI2/EditControls/ViolationListDialog.xaml
index d314bb5e..b3fd8355 100644
--- a/ENI2/EditControls/ViolationListDialog.xaml
+++ b/ENI2/EditControls/ViolationListDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Topmost="False">
+        Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/Eni2;component/Resources/bullet_ball_yellow.ico" Topmost="False">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
diff --git a/ENI2/EditControls/VisitIdDialog.xaml b/ENI2/EditControls/VisitIdDialog.xaml
index aaa5baa5..812582b6 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml
+++ b/ENI2/EditControls/VisitIdDialog.xaml
@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_new.ico">
+        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/Eni2;component/Resources/id_card_new.ico">
     <Grid Margin="4">
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml
index 46cf0c6a..a09b88e3 100644
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@@ -10,7 +10,7 @@
         xmlns:util="clr-namespace:ENI2.Util"
         xmlns:local="clr-namespace:ENI2"        
         mc:Ignorable="d"
-        Title="ENI 2 Testversion" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
+        Title="ENI 2" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
         SourceInitialized="Window_SourceInitialized">
 
     <Window.CommandBindings>
diff --git a/ENI2/Resources/EUREPORT.png b/ENI2/Resources/EUREPORT.png
index 375b2af7..a5a38e0c 100644
Binary files a/ENI2/Resources/EUREPORT.png and b/ENI2/Resources/EUREPORT.png differ
diff --git a/bsmd.LockingService/bsmd.LockingService.csproj.user b/bsmd.LockingService/bsmd.LockingService.csproj.user
index afa33dd1..3517ad61 100644
--- a/bsmd.LockingService/bsmd.LockingService.csproj.user
+++ b/bsmd.LockingService/bsmd.LockingService.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />