Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -r5a759c89e803b85ef4ef2f411547e2458cfd9bc6 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision 5a759c89e803b85ef4ef2f411547e2458cfd9bc6)
+++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -88,7 +88,6 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj	(.../Application.Ringtoets.Storage.TestUtil.Test.csproj)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj	(.../Application.Ringtoets.Storage.TestUtil.Test.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -37,20 +37,11 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj
===================================================================
diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision 05013c44d1273bac219a442dc7959706c6bac715)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj	(.../Application.Ringtoets.Storage.TestUtil.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -41,9 +41,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.SqlServer">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -52,7 +49,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r1540722ceb90ef7daa6d9e0f063d2ddcb441d781 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1540722ceb90ef7daa6d9e0f063d2ddcb441d781)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -70,10 +70,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="MathNet.Numerics, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\MathNet.Numerics.3.8.0\lib\net40\MathNet.Numerics.dll</HintPath>
       <Private>True</Private>
@@ -84,7 +80,6 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Numerics" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
Index: Core/Common/src/Core.Common.Utils/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/src/Core.Common.Utils/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Core/Common/src/Core.Common.Utils/packages.config	(.../packages.config)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -22,6 +22,5 @@
 All rights reserved.
 -->
 <packages>
-  <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="MathNet.Numerics" version="3.8.0" targetFramework="net40" />
 </packages>
Index: Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj
===================================================================
diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb)
+++ Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -64,10 +64,10 @@
     <Compile Include="PresentationObjects\ObservableWrappedObjectContextBaseTest.cs" />
     <Compile Include="PresentationObjects\WrappedObjectContextBaseTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
+    <Compile Include="Properties\Resources.Designer.cs">
+      <DependentUpon>Resources.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="TextEditor\RichTextBoxControlTest.cs" />
   </ItemGroup>
@@ -96,7 +96,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs
===================================================================
diff -u -rf1be6965092b5dc1b0e2e145d59e718493351fb8 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs	(.../DataGridViewComboBoxItemWrapperTest.cs)	(revision f1be6965092b5dc1b0e2e145d59e718493351fb8)
+++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs	(.../DataGridViewComboBoxItemWrapperTest.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Core.Common.Controls.DataGrid;
+using Core.Common.Controls.Properties;
 using NUnit.Framework;
 
 namespace Core.Common.Controls.Test.DataGrid
@@ -49,7 +50,7 @@
             var dataGridViewComboBoxItemWrapper = new DataGridViewComboBoxItemWrapper<TestClass>(null);
 
             // Assert
-            Assert.AreEqual(Properties.Resources.DataGridViewComboBoxItemWrapper_DisplayName_None, dataGridViewComboBoxItemWrapper.DisplayName);
+            Assert.AreEqual(Resources.DataGridViewComboBoxItemWrapper_DisplayName_None, dataGridViewComboBoxItemWrapper.DisplayName);
             Assert.IsNull(dataGridViewComboBoxItemWrapper.WrappedObject);
             Assert.AreEqual(dataGridViewComboBoxItemWrapper, dataGridViewComboBoxItemWrapper.This);
         }
Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs
===================================================================
diff -u -r28e867674791c1111107ea44e960313f43fc6aea -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs	(.../DataGridViewControlTest.cs)	(revision 28e867674791c1111107ea44e960313f43fc6aea)
+++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs	(.../DataGridViewControlTest.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -27,6 +27,7 @@
 using System.Windows.Forms;
 using Core.Common.Base.Data;
 using Core.Common.Controls.DataGrid;
+using Core.Common.Controls.Test.Properties;
 using Core.Common.Utils;
 using Core.Common.Utils.Attributes;
 using Core.Common.Utils.Reflection;
Fisheye: Tag c86728184e45b8061d96bf902231c7cd5d5aaa3d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Test/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c86728184e45b8061d96bf902231c7cd5d5aaa3d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Test/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -95,10 +95,10 @@
     <Compile Include="LogLevelConstant.cs" />
     <Compile Include="Point2DComparerWithTolerance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
+    <Compile Include="Properties\Resources.Designer.cs">
+      <DependentUpon>Resources.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="TestDataPath.cs" />
     <Compile Include="TestHelper.cs" />
@@ -123,7 +123,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
Index: Core/Common/test/Core.Common.TestUtil/Properties/Resources.Designer.cs
===================================================================
diff -u -r75ad5730c02e0da29baef8b3a43cf8e56fb7feda -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.TestUtil/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 75ad5730c02e0da29baef8b3a43cf8e56fb7feda)
+++ Core/Common/test/Core.Common.TestUtil/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2016. All rights reserved.
-//
-// This file is part of Ringtoets.
-//
-// Ringtoets is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
Fisheye: Tag c86728184e45b8061d96bf902231c7cd5d5aaa3d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c86728184e45b8061d96bf902231c7cd5d5aaa3d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs
===================================================================
diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs	(.../WindowsFormsTestHelper.cs)	(revision 0d22462e91eb69208ab2aee6ed2c621d31006b02)
+++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs	(.../WindowsFormsTestHelper.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -25,6 +25,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
+using Core.Common.TestUtil.Properties;
 using NUnit.Framework;
 
 namespace Core.Common.TestUtil
Index: Core/Common/test/Core.Common.Utils.Test/EnumTypeConverterTest.cs
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.Utils.Test/EnumTypeConverterTest.cs	(.../EnumTypeConverterTest.cs)	(revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Core/Common/test/Core.Common.Utils.Test/EnumTypeConverterTest.cs	(.../EnumTypeConverterTest.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -3,16 +3,16 @@
 // This file is part of Ringtoets.
 //
 // Ringtoets is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // 
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// GNU Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU Lesser General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 // All names, logos, and references to "Deltares" are registered trademarks of
Index: Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.18444
Index: Core/Plugins/src/Core.Plugins.Map/Properties/Resources.Designer.cs
===================================================================
diff -u -rd1c832128168938c7cb5ed4b1ac54382e0fc96fe -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Core/Plugins/src/Core.Plugins.Map/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d1c832128168938c7cb5ed4b1ac54382e0fc96fe)
+++ Core/Plugins/src/Core.Plugins.Map/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.17929
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5bdb5ecc12d8c8e7ef49b63f0a40dfbdd2532d54)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Ringtoets.GrassCoverErosionInwards.IO.csproj
===================================================================
diff -u -r5a759c89e803b85ef4ef2f411547e2458cfd9bc6 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Ringtoets.GrassCoverErosionInwards.IO.csproj	(.../Ringtoets.GrassCoverErosionInwards.IO.csproj)	(revision 5a759c89e803b85ef4ef2f411547e2458cfd9bc6)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Ringtoets.GrassCoverErosionInwards.IO.csproj	(.../Ringtoets.GrassCoverErosionInwards.IO.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -32,12 +32,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotSpatial.Data, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c29dbf30e059ca9d, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Topology, Version=1.8.0.0, Culture=neutral, PublicKeyToken=a66b5e9434ca3671, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r9dcd81bfae04f926cf7af8f094daa878b50f4fd9 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9dcd81bfae04f926cf7af8f094daa878b50f4fd9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -203,78 +203,78 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to LocationID
-        ///303193
-        ///303195
-        ///303325
-        ///303494
-        ///303511
-        ///303542
-        ///304012
-        ///304114
-        ///304130
-        ///304133
-        ///304137
-        ///304138
-        ///304139
-        ///304140
-        ///304142
-        ///304177
-        ///304214
-        ///304220
-        ///304251
-        ///304264
-        ///304271
-        ///304339
-        ///304341
-        ///304401
-        ///304408
-        ///304411
-        ///304454
-        ///304458
-        ///304459
-        ///304466
-        ///304473
-        ///304604
-        ///305116
-        ///305161
-        ///305162
-        ///305164
-        ///305220
-        ///305229
-        ///305258
-        ///305260
-        ///305261
-        ///305290
-        ///305342
-        ///305377
-        ///305392
-        ///305414
-        ///305416
-        ///305421
-        ///305452
-        ///305456
-        ///305478
-        ///305497
-        ///305505
-        ///305533
-        ///305617
-        ///305633
-        ///305653
-        ///305654
-        ///305655
-        ///305656
-        ///305659
-        ///305660
-        ///305669
-        ///305672
-        ///305674
-        ///305675
-        ///305676
-        ///305677
-        ///305678
-        ///305680
-        ///305682
+        ///   Looks up a localized string similar to LocationID
+        ///303193
+        ///303195
+        ///303325
+        ///303494
+        ///303511
+        ///303542
+        ///304012
+        ///304114
+        ///304130
+        ///304133
+        ///304137
+        ///304138
+        ///304139
+        ///304140
+        ///304142
+        ///304177
+        ///304214
+        ///304220
+        ///304251
+        ///304264
+        ///304271
+        ///304339
+        ///304341
+        ///304401
+        ///304408
+        ///304411
+        ///304454
+        ///304458
+        ///304459
+        ///304466
+        ///304473
+        ///304604
+        ///305116
+        ///305161
+        ///305162
+        ///305164
+        ///305220
+        ///305229
+        ///305258
+        ///305260
+        ///305261
+        ///305290
+        ///305342
+        ///305377
+        ///305392
+        ///305414
+        ///305416
+        ///305421
+        ///305452
+        ///305456
+        ///305478
+        ///305497
+        ///305505
+        ///305533
+        ///305617
+        ///305633
+        ///305653
+        ///305654
+        ///305655
+        ///305656
+        ///305659
+        ///305660
+        ///305669
+        ///305672
+        ///305674
+        ///305675
+        ///305676
+        ///305677
+        ///305678
+        ///305680
+        ///305682
         ///3056 [rest of string was truncated]&quot;;.
         /// </summary>
         public static string HydraulicBoundaryLocationsFilterList {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs
===================================================================
diff -u -r06abcaadc2936c0bf3fde73916c051f37f698505 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs	(.../StochasticSoilModelProperties.cs)	(revision 06abcaadc2936c0bf3fde73916c051f37f698505)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs	(.../StochasticSoilModelProperties.cs)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -26,8 +26,9 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.Common.Data.Properties;
+using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Piping.Data;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.PropertyClasses
 {
@@ -37,9 +38,9 @@
     public class StochasticSoilModelProperties : ObjectProperties<StochasticSoilModel>
     {
         [PropertyOrder(1)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "StochasticSoilModel_Id_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "StochasticSoilModel_Id_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonDataResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "StochasticSoilModel_Id_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "StochasticSoilModel_Id_Description")]
         public long Id
         {
             get
@@ -49,9 +50,9 @@
         }
 
         [PropertyOrder(2)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "StochasticSoilModel_Name_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "StochasticSoilModel_Name_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonDataResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "StochasticSoilModel_Name_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "StochasticSoilModel_Name_Description")]
         public string Name
         {
             get
@@ -61,9 +62,9 @@
         }
 
         [PropertyOrder(3)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "StochasticSoilModel_SegmentName_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "StochasticSoilModel_SegmentName_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonDataResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "StochasticSoilModel_SegmentName_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "StochasticSoilModel_SegmentName_Description")]
         public string SegmentName
         {
             get
@@ -74,9 +75,9 @@
 
         [PropertyOrder(4)]
         [TypeConverter(typeof(ExpandableArrayConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "StochasticSoilModel_Geometry_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "StochasticSoilModel_Geometry_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonDataResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "StochasticSoilModel_Geometry_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "StochasticSoilModel_Geometry_Description")]
         public Point2D[] Geometry
         {
             get
@@ -87,9 +88,9 @@
 
         [PropertyOrder(5)]
         [TypeConverter(typeof(ExpandableArrayConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "StochasticSoilModel_StochasticSoilProfiles_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "StochasticSoilModel_StochasticSoilProfiles_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonDataResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "StochasticSoilModel_StochasticSoilProfiles_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "StochasticSoilModel_StochasticSoilProfiles_Description")]
         public StochasticSoilProfileProperties[] StochasticSoilProfiles
         {
             get
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj
===================================================================
diff -u -r669abaf20f73e5b35a7ce4c0e78690097da77ef7 -rc86728184e45b8061d96bf902231c7cd5d5aaa3d
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj	(.../Ringtoets.Piping.Service.csproj)	(revision 669abaf20f73e5b35a7ce4c0e78690097da77ef7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj	(.../Ringtoets.Piping.Service.csproj)	(revision c86728184e45b8061d96bf902231c7cd5d5aaa3d)
@@ -44,7 +44,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">