diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 98ab49dd..cd26ef0c 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Dänemark/NSW-DK-Excel-Arrival.xltx b/nsw/Dänemark/NSW-DK-Excel-Arrival.xltx
index 51c83ba3..dc69da7f 100644
Binary files a/nsw/Dänemark/NSW-DK-Excel-Arrival.xltx and b/nsw/Dänemark/NSW-DK-Excel-Arrival.xltx differ
diff --git a/nsw/Dänemark/NSW-DK-Excel-Departure.xltx b/nsw/Dänemark/NSW-DK-Excel-Departure.xltx
index 53a5caa5..59e84157 100644
Binary files a/nsw/Dänemark/NSW-DK-Excel-Departure.xltx and b/nsw/Dänemark/NSW-DK-Excel-Departure.xltx differ
diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs
index c8261298..6c17b655 100644
--- a/nsw/Source/SendNSWMessageService/NSWSendService.cs
+++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs
@@ -138,6 +138,12 @@ namespace SendNSWMessageService
                                 // versendet, bis im ENI der Status wieder explizit zurückgesetzt wird (16.4.16)
                                 if (message.InternalStatus == Message.BSMDStatus.SUSPENDED) continue;
 
+                                // "virtuelle" Messages nicht versenden (DK, EU)
+                                if ((message.MessageNotificationClass == Message.NotificationClass.STO) ||
+                                    (message.MessageNotificationClass == Message.NotificationClass.CREWD) ||
+                                    (message.MessageNotificationClass == Message.NotificationClass.PASD))
+                                    continue;
+
                                 // Wenn das ein Transit ist, werden nicht erforderliche Meldeklassen übersprungen
                                 if (core.IsTransit)
                                 {                                    
diff --git a/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj b/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj
index d8f4edba..7fd1f48c 100644
--- a/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj
+++ b/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/nsw/Source/SendNSWMessageService/packages.config b/nsw/Source/SendNSWMessageService/packages.config
deleted file mode 100644
index a51db168..00000000
--- a/nsw/Source/SendNSWMessageService/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.ExcelReadService.sln b/nsw/Source/bsmd.ExcelReadService.sln
index 525cef08..02d58d4d 100644
--- a/nsw/Source/bsmd.ExcelReadService.sln
+++ b/nsw/Source/bsmd.ExcelReadService.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bsmd.ExcelReadService", "bsmd.ExcelReadService\bsmd.ExcelReadService.csproj", "{9475E638-DCFB-49E8-BD4E-3513D106C82A}"
 EndProject
diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
index 9d9f6950..3a9cb896 100644
--- a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
+++ b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
@@ -225,6 +225,36 @@ namespace bsmd.ExcelReadService
             return result;
         }
 
+        /// <summary>
+        /// read nationality field an returns 2 Char ISO code (optional lookup) and "confirms"
+        /// the field
+        /// </summary>
+        internal string ReadNationality(string lookup)
+        {
+            string val = this.ReadText(lookup);
+            if(val.IsNullOrEmpty()) {
+                this.Conf.ConfirmText(lookup, null, ReadState.FAIL);
+            }
+
+            if(val.Length > 2)
+            {
+                string isoCode = LocodeDB.CountryCodeFromName(val);
+                if(isoCode != null)
+                {
+                    this.Conf.ConfirmText(lookup, val, ReadState.OK);
+                    val = isoCode;
+                } else
+                {
+                    this.Conf.ConfirmText(lookup, val, ReadState.WARN);
+                }
+            }
+
+            if (val.Length == 2)
+                this.Conf.ConfirmText(lookup, val, ReadState.OK);
+
+            return val;
+        }
+
         internal byte? ReadHullConfiguration(string lookup)
         {
             string val = this.ReadText(lookup);
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index d8137368..778ad684 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -274,9 +274,10 @@ namespace bsmd.ExcelReadService
 			{
 				string bpolName = string.Format("BPOL.PortOfItineraryName_{0}", i);
 				string bpolLocode = string.Format("BPOL.PortOfItineraryLoCode_{0}", i);
-				string bpolETA = string.Format("BPOL.PortOfItineraryETA_{0}", i);
+				string bpolETADate = string.Format("BPOL.PortOfItineraryETADate_{0}", i);
+                string bpolETATime = string.Format("BPOL.PortOfItineraryETATime_{0}", i);
 
-				string bpolNameValue = reader.ReadText(bpolName)?.Trim();
+                string bpolNameValue = reader.ReadText(bpolName)?.Trim();
 				if (!bpolNameValue.IsNullOrEmpty())
 				{
 					PortOfItinerary poi = bpol.GetSublistElementWithIdentifier(i.ToString()) as PortOfItinerary;
@@ -294,8 +295,7 @@ namespace bsmd.ExcelReadService
 					{
 						reader.Conf.ConfirmText(bpolLocode, poi.PortOfItineraryLocode, ExcelReader.ReadState.WARN);
 					}
-					poi.PortOfItineraryETA = reader.ReadDate(bpolETA);
-
+                    poi.PortOfItineraryETA = reader.ReadDateTime(bpolETADate, bpolETATime);
 				}
 			}
 		}
@@ -994,7 +994,9 @@ namespace bsmd.ExcelReadService
             {
 
                 noa_nod.ETAToPortOfCall = messageCore.ETA;
-                reader.Conf.ConfirmDate("NOA_NOD.ETAToPortOfCall", noa_nod.ETAToPortOfCall, ExcelReader.ReadState.OK);
+                // Zeit muss zurückkonvertiert werden, da toUniversalTime() kodiert
+                if(noa_nod.ETAToPortOfCall.HasValue)
+                    reader.Conf.ConfirmDate("NOA_NOD.ETAToPortOfCall", noa_nod.ETAToPortOfCall.Value.ToLocalTime(), ExcelReader.ReadState.OK);
 
                 for (int i = 1; i <= noa_nod.NumberOfExcelRows; i++)
                 {
@@ -1074,11 +1076,17 @@ namespace bsmd.ExcelReadService
             if(messageCore.IsTransit)
             {
                 noa_nod.ETDFromKielCanal = reader.ReadDateTime("NOA_NOD.ETDDateFromPortOfCall", "NOA_NOD.ETDTimeFromPortOfCall");
-                reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromKielCanal, ExcelReader.ReadState.OK);
+                if(noa_nod.ETDFromKielCanal.HasValue)
+                    reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromKielCanal.Value.ToLocalTime(), ExcelReader.ReadState.OK);
+                else
+                    reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", null, ExcelReader.ReadState.FAIL);
             } else
             {
                 noa_nod.ETDFromPortOfCall = reader.ReadDateTime("NOA_NOD.ETDDateFromPortOfCall", "NOA_NOD.ETDTimeFromPortOfCall");
-                reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromPortOfCall, ExcelReader.ReadState.OK);
+                if(noa_nod.ETDFromPortOfCall.HasValue)
+                    reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", noa_nod.ETDFromPortOfCall.Value.ToLocalTime(), ExcelReader.ReadState.OK);
+                else
+                    reader.Conf.ConfirmDate("NOA_NOD.ETDFromPortOfCall", null, ExcelReader.ReadState.FAIL);
             }
 			
 			noa_nod.ETDFromLastPort = reader.ReadDateTime("NOA_NOD.ETDDateFromLastPort", "NOA_NOD.ETDTimeFromLastPort");
@@ -1171,9 +1179,9 @@ namespace bsmd.ExcelReadService
 				}
 
 				waste.WasteType = (int?) reader.ReadNumber(wasteCode);
-				reader.Conf.ConfirmText(wastetype, waste.WasteTypeDisplayV4, ExcelReader.ReadState.OK);
-				
-				reader.Conf.ConfirmNumber(wastetype, waste.WasteType, ExcelReader.ReadState.OK);
+				reader.Conf.ConfirmText(wastetype, waste.WasteTypeDisplayV4, ExcelReader.ReadState.OK);				
+				reader.Conf.ConfirmNumber(wasteCode, waste.WasteType, ExcelReader.ReadState.OK);
+
 				waste.WasteDescription = reader.ReadText(wasteDescription);
 				if (waste.WasteDescription.IsNullOrEmpty())
 				{
@@ -1823,12 +1831,7 @@ namespace bsmd.ExcelReadService
 					crew.CrewMemberDuty = reader.ReadText(crewDuty);
 					reader.Conf.ConfirmText(crewDuty, crew.CrewMemberDuty, ExcelReader.ReadState.OK);
 
-					crew.CrewMemberNationality = reader.ReadText(crewNationality);
-					if (!crew.CrewMemberNationality.IsNullOrEmpty() && (crew.CrewMemberNationality.Length > 2))
-						reader.Conf.ConfirmText(crewNationality, crew.CrewMemberNationality, ExcelReader.ReadState.FAIL);
-					else
-						reader.Conf.ConfirmText(crewNationality, crew.CrewMemberNationality, ExcelReader.ReadState.OK);
-
+                    crew.CrewMemberNationality = reader.ReadNationality(crewNationality);                   					
 					crew.CrewMemberPlaceOfBirth = reader.ReadText(crewPlaceOfBirth);
 					reader.Conf.ConfirmText(crewPlaceOfBirth, crew.CrewMemberPlaceOfBirth, ExcelReader.ReadState.OK);
 
@@ -1880,12 +1883,7 @@ namespace bsmd.ExcelReadService
 					crew.CrewMemberDuty = reader.ReadText(crewDuty);
 					reader.Conf.ConfirmText(crewDuty, crew.CrewMemberDuty, ExcelReader.ReadState.OK);
 
-					crew.CrewMemberNationality = reader.ReadText(crewNationality);
-					if (!crew.CrewMemberNationality.IsNullOrEmpty() && (crew.CrewMemberNationality.Length > 2))
-						reader.Conf.ConfirmText(crewNationality, crew.CrewMemberNationality, ExcelReader.ReadState.FAIL);
-					else
-						reader.Conf.ConfirmText(crewNationality, crew.CrewMemberNationality, ExcelReader.ReadState.OK);
-
+					crew.CrewMemberNationality = reader.ReadNationality(crewNationality);                    
 					crew.CrewMemberPlaceOfBirth = reader.ReadText(crewPlaceOfBirth);
 					reader.Conf.ConfirmText(crewPlaceOfBirth, crew.CrewMemberPlaceOfBirth, ExcelReader.ReadState.OK);
 
@@ -1941,11 +1939,7 @@ namespace bsmd.ExcelReadService
 					pas.PassengerFirstName = reader.ReadText(pasFirstName);
 					reader.Conf.ConfirmText(pasFirstName, pas.PassengerFirstName, ExcelReader.ReadState.OK);
 					pas.PassengerGender = reader.ReadGender(pasGender);
-					pas.PassengerNationality = reader.ReadText(pasNationality);
-					if (!pas.PassengerNationality.IsNullOrEmpty() && pas.PassengerNationality.Length > 2)
-						reader.Conf.ConfirmText(pasNationality, pas.PassengerNationality, ExcelReader.ReadState.FAIL);
-					else
-						reader.Conf.ConfirmText(pasNationality, pas.PassengerNationality, ExcelReader.ReadState.OK);
+					pas.PassengerNationality = reader.ReadNationality(pasNationality);					
 					// TODO: Nicht klar ob hier LOCODEs kommen oder nicht
 					pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation);
 					reader.Conf.ConfirmText(pasEmbarkation, pas.PassengerPortOfEmbarkation, ExcelReader.ReadState.OK);
@@ -1999,11 +1993,7 @@ namespace bsmd.ExcelReadService
 					pas.PassengerFirstName = reader.ReadText(pasFirstName);
 					reader.Conf.ConfirmText(pasFirstName, pas.PassengerFirstName, ExcelReader.ReadState.OK);
 					pas.PassengerGender = reader.ReadGender(pasGender);
-					pas.PassengerNationality = reader.ReadText(pasNationality);
-					if (!pas.PassengerNationality.IsNullOrEmpty() && pas.PassengerNationality.Length > 2)
-						reader.Conf.ConfirmText(pasNationality, pas.PassengerNationality, ExcelReader.ReadState.FAIL);
-					else
-						reader.Conf.ConfirmText(pasNationality, pas.PassengerNationality, ExcelReader.ReadState.OK);
+					pas.PassengerNationality = reader.ReadNationality(pasNationality);					
 					// TODO: Nicht klar ob hier LOCODEs kommen oder nicht
 					pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation);
 					reader.Conf.ConfirmText(pasEmbarkation, pas.PassengerPortOfEmbarkation, ExcelReader.ReadState.OK);
diff --git a/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj b/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
index c2168ac2..7fe100ad 100644
--- a/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
+++ b/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
@@ -34,8 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
@@ -48,8 +48,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Drawing" />
@@ -129,12 +129,12 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.104.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.104.0\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.104.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.104.0\build\net45\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/nsw/Source/bsmd.ExcelReadService/packages.config b/nsw/Source/bsmd.ExcelReadService/packages.config
index d556a49e..ca3bd3ec 100644
--- a/nsw/Source/bsmd.ExcelReadService/packages.config
+++ b/nsw/Source/bsmd.ExcelReadService/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="log4net" version="2.0.7" targetFramework="net45" />
   <package id="OpenPop.NET" version="2.0.6.1120" targetFramework="net45" />
-  <package id="System.Data.SQLite.Core" version="1.0.103" targetFramework="net45" />
+  <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj b/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj
index e4de90bf..53a82fec 100644
--- a/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj
+++ b/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj
@@ -41,8 +41,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MigraDoc.DocumentObjectModel">
diff --git a/nsw/Source/bsmd.ReportGenerator/packages.config b/nsw/Source/bsmd.ReportGenerator/packages.config
index 0748b064..38d73b99 100644
--- a/nsw/Source/bsmd.ReportGenerator/packages.config
+++ b/nsw/Source/bsmd.ReportGenerator/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="log4net" version="2.0.7" targetFramework="net45" />
   <package id="PDFsharp-MigraDoc-GDI" version="1.32.4334.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.Tool/bsmd.Tool.csproj b/nsw/Source/bsmd.Tool/bsmd.Tool.csproj
index e9b4c238..8ba835ac 100644
--- a/nsw/Source/bsmd.Tool/bsmd.Tool.csproj
+++ b/nsw/Source/bsmd.Tool/bsmd.Tool.csproj
@@ -41,8 +41,8 @@
     <Reference Include="CommandLine">
       <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/nsw/Source/bsmd.Tool/packages.config b/nsw/Source/bsmd.Tool/packages.config
index 2aef408e..600f273e 100644
--- a/nsw/Source/bsmd.Tool/packages.config
+++ b/nsw/Source/bsmd.Tool/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="log4net" version="2.0.7" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.dakosy/bsmd.dakosy.csproj b/nsw/Source/bsmd.dakosy/bsmd.dakosy.csproj
index 5c7c5156..6283ac89 100644
--- a/nsw/Source/bsmd.dakosy/bsmd.dakosy.csproj
+++ b/nsw/Source/bsmd.dakosy/bsmd.dakosy.csproj
@@ -36,8 +36,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/nsw/Source/bsmd.dakosy/packages.config b/nsw/Source/bsmd.dakosy/packages.config
deleted file mode 100644
index a51db168..00000000
--- a/nsw/Source/bsmd.dakosy/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 9bdf4408..f8c8cd52 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.3.8")]
+[assembly: AssemblyInformationalVersion("3.3.9")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index 4e608b66..5a999ae8 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.3.8.*")]
+[assembly: AssemblyVersion("3.3.9.*")]
 
diff --git a/nsw/Source/bsmd.database/bsmd.database.csproj b/nsw/Source/bsmd.database/bsmd.database.csproj
index 23298b61..2a546aca 100644
--- a/nsw/Source/bsmd.database/bsmd.database.csproj
+++ b/nsw/Source/bsmd.database/bsmd.database.csproj
@@ -39,8 +39,9 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\CoreDeleteTool\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/nsw/Source/bsmd.database/packages.config b/nsw/Source/bsmd.database/packages.config
deleted file mode 100644
index a51db168..00000000
--- a/nsw/Source/bsmd.database/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj b/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj
index cc83bc8f..27ac3303 100644
--- a/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj
+++ b/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj
@@ -20,6 +20,7 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,8 +40,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web.DynamicData" />
@@ -93,7 +95,6 @@
     <Folder Include="App_Data\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
     <Content Include="..\bsmdKey.snk">
       <Link>bsmdKey.snk</Link>
     </Content>
@@ -101,6 +102,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj.user b/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj.user
index e849db72..8fd7ad14 100644
--- a/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj.user
+++ b/nsw/Source/bsmd.dbh.ResponseService/bsmd.dbh.ResponseService.csproj.user
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UseIISExpress>true</UseIISExpress>
+  </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
diff --git a/nsw/Source/bsmd.dbh.ResponseService/packages.config b/nsw/Source/bsmd.dbh.ResponseService/packages.config
deleted file mode 100644
index 981a91a1..00000000
--- a/nsw/Source/bsmd.dbh.ResponseService/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.3" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.dbh/bsmd.dbh.csproj b/nsw/Source/bsmd.dbh/bsmd.dbh.csproj
index 41f977af..db23a3e8 100644
--- a/nsw/Source/bsmd.dbh/bsmd.dbh.csproj
+++ b/nsw/Source/bsmd.dbh/bsmd.dbh.csproj
@@ -36,8 +36,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/nsw/Source/bsmd.dbh/packages.config b/nsw/Source/bsmd.dbh/packages.config
deleted file mode 100644
index a51db168..00000000
--- a/nsw/Source/bsmd.dbh/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.email/bsmd.email.csproj b/nsw/Source/bsmd.email/bsmd.email.csproj
index 736d36cf..dc774a91 100644
--- a/nsw/Source/bsmd.email/bsmd.email.csproj
+++ b/nsw/Source/bsmd.email/bsmd.email.csproj
@@ -39,8 +39,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenPop, Version=2.0.6.1120, Culture=neutral, PublicKeyToken=6bdb97f144b7efc8, processorArchitecture=MSIL">
diff --git a/nsw/Source/bsmd.email/packages.config b/nsw/Source/bsmd.email/packages.config
index 32a80424..9440aefd 100644
--- a/nsw/Source/bsmd.email/packages.config
+++ b/nsw/Source/bsmd.email/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="log4net" version="2.0.7" targetFramework="net45" />
   <package id="OpenPop.NET" version="2.0.6.1120" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.herberg.FormService/bsmd.herberg.FormService.csproj b/nsw/Source/bsmd.herberg.FormService/bsmd.herberg.FormService.csproj
index 120049a4..1d22b43f 100644
--- a/nsw/Source/bsmd.herberg.FormService/bsmd.herberg.FormService.csproj
+++ b/nsw/Source/bsmd.herberg.FormService/bsmd.herberg.FormService.csproj
@@ -43,8 +43,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/nsw/Source/bsmd.herberg.FormService/packages.config b/nsw/Source/bsmd.herberg.FormService/packages.config
deleted file mode 100644
index a51db168..00000000
--- a/nsw/Source/bsmd.herberg.FormService/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj b/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj
index 5f59b5b3..bcbfd13d 100644
--- a/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj
+++ b/nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj
@@ -36,8 +36,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/nsw/Source/bsmd.hisnord/packages.config b/nsw/Source/bsmd.hisnord/packages.config
deleted file mode 100644
index a51db168..00000000
--- a/nsw/Source/bsmd.hisnord/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/nsw/Source/misc/db.sqlite b/nsw/Source/misc/db.sqlite
index c802673a..9a5b4b37 100644
Binary files a/nsw/Source/misc/db.sqlite and b/nsw/Source/misc/db.sqlite differ