Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -98,11 +98,6 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls.Swf/Resources/binocular.png
===================================================================
diff -u -r74d6f87d2ed1665ad47ad38eea8c7ef7402265c0 -r3275fac43bec51c916db0b401361f3ffc44ebb18
Binary files differ
Index: Core/Common/src/Core.Common.Controls.Swf/Resources/cross.png
===================================================================
diff -u -r74d6f87d2ed1665ad47ad38eea8c7ef7402265c0 -r3275fac43bec51c916db0b401361f3ffc44ebb18
Binary files differ
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r6a30be3a0a6f87e97e5144b981180aaba1609e54 -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 6a30be3a0a6f87e97e5144b981180aaba1609e54)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -91,6 +91,9 @@
     <Compile Include="Dialogs\ExceptionDialog.Designer.cs">
       <DependentUpon>ExceptionDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Views\HtmlPageView.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Views\IView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -100,6 +103,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Core.Common.Version\Core.Common.Version.csproj">
       <Project>{c90b77da-e421-43cc-b82e-529651bc21ac}</Project>
       <Name>Core.Common.Version</Name>
@@ -136,6 +143,10 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\HtmlPageView.resx">
+      <DependentUpon>HtmlPageView.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\bug--exclamation.ico" />
Index: Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -0,0 +1,46 @@
+using System.Windows.Forms;
+using Core.Common.Utils;
+
+namespace Core.Common.Controls.Views
+{
+    /// <summary>
+    /// Class for showing a html page based on an <see cref="Url"/>.
+    /// </summary>
+    public class HtmlPageView : WebBrowser, IView
+    {
+        private Url url;
+
+        /// <summary>
+        /// Constructs a new <see cref="HtmlPageView"/>.
+        /// </summary>
+        public HtmlPageView()
+        {
+            ScriptErrorsSuppressed = true;
+        }
+
+        public object Data
+        {
+            get
+            {
+                return url;
+            }
+            set
+            {
+                url = (Url) value;
+
+                if (url != null && url.Path != null)
+                {
+                    Navigate(url.Path);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get or sets the text of the <see cref="HtmlPageView"/>.
+        /// </summary>
+        /// <remarks>
+        /// A base implementation was already provided by <see cref="WebBrowser"/> but this implementation turned out to only throw exceptions.
+        /// </remarks>
+        public override string Text { get; set; }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Views/HtmlPageView.resx
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Views/HtmlPageView.resx	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Views/HtmlPageView.resx	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Swf.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3275fac43bec51c916db0b401361f3ffc44ebb18 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Swf.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Test/Core.Common.Test.csproj
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Common/test/Core.Common.Test/Core.Common.Test.csproj	(.../Core.Common.Test.csproj)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Core/Common/test/Core.Common.Test/Core.Common.Test.csproj	(.../Core.Common.Test.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -151,10 +151,6 @@
       <Project>{4a7d6720-4aa1-4f0b-a796-a0436db3d7d7}</Project>
       <Name>Application.Ringtoets</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs
===================================================================
diff -u -r18e78f440e1df8cd03e3e337ef385b58266a34a5 -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 18e78f440e1df8cd03e3e337ef385b58266a34a5)
+++ Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Controls;
-using Core.Common.Controls.Swf;
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
Index: Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r5fc49ff1f8950ee4e33887edb6c543fac700b5dd -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 5fc49ff1f8950ee4e33887edb6c543fac700b5dd)
+++ Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Core.Common.Base.Data;
-using Core.Common.Controls.Swf;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Plugin;
Index: Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj
===================================================================
diff -u -rea23f63aaa17ddf43d3e5c753a53515a504ece38 -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj	(.../Core.Plugins.CommonTools.csproj)	(revision ea23f63aaa17ddf43d3e5c753a53515a504ece38)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj	(.../Core.Plugins.CommonTools.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -75,11 +75,6 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3dbd23ce-5c4a-4a49-b51c-b268cb2b510e}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj
===================================================================
diff -u -r932536001ac8dc75afa8ea514217ae8ec1f6cf8c -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj	(.../Core.Plugins.SharpMapGis.Gui.csproj)	(revision 932536001ac8dc75afa8ea514217ae8ec1f6cf8c)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj	(.../Core.Plugins.SharpMapGis.Gui.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -172,11 +172,6 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3dbd23ce-5c4a-4a49-b51c-b268cb2b510e}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
       <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
       <Name>Core.Common.Controls.TreeView</Name>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.Designer.cs
===================================================================
diff -u -r3fb69f07c60a616b77157d8be0eea947ffa8ebcc -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.Designer.cs	(.../MapView.Designer.cs)	(revision 3fb69f07c60a616b77157d8be0eea947ffa8ebcc)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.Designer.cs	(.../MapView.Designer.cs)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -1,4 +1,4 @@
-using Core.Common.Controls.Swf;
+using Core.Common.Controls;
 using Core.GIS.SharpMap.UI.Forms;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -r3fb69f07c60a616b77157d8be0eea947ffa8ebcc -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 3fb69f07c60a616b77157d8be0eea947ffa8ebcc)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -1,17 +1,11 @@
 using System;
-using System.Collections.Specialized;
-using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Controls.Swf;
 using Core.Common.Controls.Views;
-using Core.Common.Utils.Events;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.CoordinateSystems.Transformations;
-using Core.GIS.SharpMap.Layers;
 using Core.GIS.SharpMap.Map;
 using Core.GIS.SharpMap.UI.Forms;
 using Core.GIS.SharpMap.UI.Tools;
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs
===================================================================
diff -u -r05cb574013e8873850f93483dcb332acd73d6bd3 -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs	(.../CommonToolsGuiPluginTest.cs)	(revision 05cb574013e8873850f93483dcb332acd73d6bd3)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs	(.../CommonToolsGuiPluginTest.cs)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -1,6 +1,6 @@
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Controls.Swf;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Swf;
 using Core.Common.Utils;
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj
===================================================================
diff -u -r5fc49ff1f8950ee4e33887edb6c543fac700b5dd -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj	(.../Core.Plugins.CommonTools.Test.csproj)	(revision 5fc49ff1f8950ee4e33887edb6c543fac700b5dd)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj	(.../Core.Plugins.CommonTools.Test.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -94,10 +94,6 @@
       <Project>{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}</Project>
       <Name>Core.Plugins.CommonTools</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj
===================================================================
diff -u -r17078d665c331e81a75521b7df713514fb6b76ae -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj	(.../Core.Plugins.SharpMapGis.Test.csproj)	(revision 17078d665c331e81a75521b7df713514fb6b76ae)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj	(.../Core.Plugins.SharpMapGis.Test.csproj)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -157,10 +157,6 @@
       <Project>{c83777fc-aabb-47d9-911f-d76255d4d541}</Project>
       <Name>Core.GIS.SharpMap</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
Index: Ringtoets.sln
===================================================================
diff -u -r7ce4f90de0003f7447301f86886d2feb92af86d7 -r3275fac43bec51c916db0b401361f3ffc44ebb18
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 7ce4f90de0003f7447301f86886d2feb92af86d7)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision 3275fac43bec51c916db0b401361f3ffc44ebb18)
@@ -28,8 +28,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls", "Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj", "{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls.Swf", "Core\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj", "{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D9858E1-CF2D-4DE5-AC0E-64401900D531}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Utils.Test", "Core\Common\test\Core.Common.Utils.Test\Core.Common.Utils.Test.csproj", "{7F937E31-02CA-41D9-B7D4-1079CF452C72}"
@@ -189,8 +187,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui.Swf.Test", "Core\Common\test\Core.Common.Gui.Swf.Test\Core.Common.Gui.Swf.Test.csproj", "{3139CC90-6740-40A1-9FC6-086A02DD113D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls.Swf.Test", "Core\Common\test\Core.Common.Controls.Swf.Test\Core.Common.Controls.Swf.Test.csproj", "{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.TestUtil.Test", "Core\Common\test\Core.Common.TestUtil.Test\Core.Common.TestUtil.Test.csproj", "{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Data.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Data.TestUtil.Test\Ringtoets.Piping.Data.TestUtil.Test.csproj", "{35B78215-420B-4D7D-9959-9E9010601200}"
@@ -312,16 +308,6 @@
 		{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}.Release|x86.Build.0 = Release|x86
 		{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.CreateInstaller|x86.Build.0 = Release|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.CreateInstallerWithDemoProject|x86.Build.0 = Release|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.Debug|x86.ActiveCfg = Debug|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.Debug|x86.Build.0 = Debug|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.Release|x86.ActiveCfg = Release|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.Release|x86.Build.0 = Release|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 		{7F937E31-02CA-41D9-B7D4-1079CF452C72}.CreateInstaller|x86.ActiveCfg = Release|x86
 		{7F937E31-02CA-41D9-B7D4-1079CF452C72}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{7F937E31-02CA-41D9-B7D4-1079CF452C72}.Debug|x86.ActiveCfg = Debug|x86
@@ -834,14 +820,6 @@
 		{3139CC90-6740-40A1-9FC6-086A02DD113D}.Release|x86.Build.0 = Release|x86
 		{3139CC90-6740-40A1-9FC6-086A02DD113D}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{3139CC90-6740-40A1-9FC6-086A02DD113D}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.Debug|x86.ActiveCfg = Debug|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.Debug|x86.Build.0 = Debug|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.Release|x86.ActiveCfg = Release|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.Release|x86.Build.0 = Release|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 		{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}.CreateInstaller|x86.ActiveCfg = Release|x86
 		{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}.Debug|x86.ActiveCfg = Debug|x86
@@ -1002,7 +980,6 @@
 		{08205620-D756-4533-922C-D6A4C0038535} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{3BBFD65B-B277-4E50-AE6D-BD24C3434609} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{9A2D67E6-26AC-4D17-B11A-2B4372F2F572} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
-		{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{43CD4CC3-8500-411B-822E-1D3B5AF56FBC} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{7F937E31-02CA-41D9-B7D4-1079CF452C72} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
@@ -1014,7 +991,6 @@
 		{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{A8CE1456-1880-4FC8-84B3-D618EA88F384} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{3139CC90-6740-40A1-9FC6-086A02DD113D} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
-		{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{FAF691DE-EAF5-44E0-A865-5A03FB395ED1} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{82D395DB-BCA4-4CCB-B607-F968FEF6044F} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{0EDC6D7D-E9CD-408A-9EA9-3E7D426809C8} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
@@ -1070,6 +1046,7 @@
 		{35B78215-420B-4D7D-9959-9E9010601200} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7} = {39EB5D07-C076-484C-9621-B34C4E5BF64C}
 		{3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E} = {39EB5D07-C076-484C-9621-B34C4E5BF64C}
+		{50963F12-448C-41BA-A62C-CDB0AB8D21E0} = {39EB5D07-C076-484C-9621-B34C4E5BF64C}
 		{DCBA56C0-E29E-43C1-A2BB-C08FC40D2B32} = {D4C84992-DE0E-4107-B4C0-D65E3667A727}
 		{4E40C7A7-6B7B-41A5-A7EE-9B23F04155DA} = {D4C84992-DE0E-4107-B4C0-D65E3667A727}
 		{FFE3A667-3A4C-4F48-BC6B-1589867FCB41} = {DCBA56C0-E29E-43C1-A2BB-C08FC40D2B32}
@@ -1086,7 +1063,6 @@
 		{D9DC93FF-DCF3-44A4-9193-9911966CDFF4} = {502CA963-E0E9-4F4A-A1D4-612C6A08386B}
 		{2344A7BD-7E25-4A1A-982E-6C674AF5167A} = {7A696ACF-BA09-41A2-A912-A26E82C494CF}
 		{4BB4D2AA-332E-42D6-8D34-FFABBCE1F1D8} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
-		{50963F12-448C-41BA-A62C-CDB0AB8D21E0} = {39EB5D07-C076-484C-9621-B34C4E5BF64C}
 		{594C5C6D-5833-4E1C-9F30-13A202628EEF} = {EE8D5A6C-4871-452A-A69B-F04E374D715E}
 	EndGlobalSection
 	GlobalSection(TextTemplating) = postSolution