Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -r0ae715fe2b16306e4147fed9749bae67ce186168 -rd212065881d696420fd33c789c917501e09c7fc0
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision 0ae715fe2b16306e4147fed9749bae67ce186168)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -119,6 +119,7 @@
     <Compile Include="Forms\RichTextViewTest.cs" />
     <Compile Include="Forms\SplashScreen\SplashScreenTest.cs" />
     <Compile Include="Forms\ViewManager\ActiveViewChangeEventArgsTest.cs" />
+    <Compile Include="Forms\ViewManager\AvalonDockDockingManagerTest.cs" />
     <Compile Include="Forms\ViewManager\DockTabClosingEventArgsTest.cs" />
     <Compile Include="Forms\ViewManager\TestView.cs">
       <SubType>UserControl</SubType>
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/AvalonDockDockingManagerTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/AvalonDockDockingManagerTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewManager/AvalonDockDockingManagerTest.cs	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -0,0 +1,64 @@
+using Core.Common.Gui.Forms.ViewManager;
+using Core.Common.Utils.Reflection;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Xceed.Wpf.AvalonDock;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Core.Common.Gui.Test.Forms.ViewManager
+{
+    [TestFixture]
+    public class AvalonDockDockingManagerTest
+    {
+        [Test]
+        [RequiresSTA]
+        public void ViewTextChangedResultsInTabNameChanged()
+        {
+            var mocks = new MockRepository();
+            var dockManager = mocks.Stub<DockingManager>();
+            var view = new TestView();
+
+            var dock = new AvalonDockDockingManager(dockManager, new[]
+            {
+                ViewLocation.Document
+            });
+            dock.Add(view, ViewLocation.Document);
+
+            var layout = TypeUtils.CallPrivateMethod<LayoutContent>(dock, "GetLayoutContent", view);
+
+            Assert.AreEqual("", layout.Title);
+            view.Text = @"Test";
+
+            Assert.AreEqual("Test", layout.Title);
+        }
+
+        [Test]
+        [RequiresSTA]
+        public void SwitchingTabCausesOldTabsActiveControlToLoseFocusTools9109()
+        {
+            var view = new TestView();
+            var view2 = new TestView();
+
+            // create an avalon dock/tab with two views
+            var dock = new AvalonDockDockingManager(new DockingManager(), new[]
+            {
+                ViewLocation.Document
+            });
+            dock.Add(view, ViewLocation.Document);
+            dock.Add(view2, ViewLocation.Document);
+            dock.ActivateView(view);
+
+            // set a textbox active
+            view.ActiveControl = view.Controls[0];
+
+            // switch to other tab
+            dock.ActivateView(view2);
+
+            // assert the textbox is no longer active 
+            Assert.IsNull(view.ActiveControl);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/App.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Core.Common.Test.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image1.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image2.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image3.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image4.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image5.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image6.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image7.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Index: Core/Common/test/Core.Common.Test/Gui/Resources/image8.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -rd212065881d696420fd33c789c917501e09c7fc0
Binary files differ
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/TestObjects/TestSettings.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/TestObjects/TestSettings.settings'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/TestObjects/TestView.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/TestObjects/TestView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/TestObjects/TestView.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d212065881d696420fd33c789c917501e09c7fc0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj
===================================================================
diff -u -rf2859c13f845d1cb1f654022aad4f48cdb5d908b -rd212065881d696420fd33c789c917501e09c7fc0
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj	(.../Core.Plugins.DotSpatial.Test.csproj)	(revision f2859c13f845d1cb1f654022aad4f48cdb5d908b)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj	(.../Core.Plugins.DotSpatial.Test.csproj)	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -58,6 +58,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
@@ -77,6 +78,12 @@
     <Compile Include="TestMapView.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="TestView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TestView.Designer.cs">
+      <DependentUpon>TestView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -105,10 +112,6 @@
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.Test\Core.Common.Test.csproj">
-      <Project>{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}</Project>
-      <Name>Core.Common.Test</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj">
       <Project>{AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD}</Project>
       <Name>Core.Components.DotSpatial</Name>
@@ -125,7 +128,11 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="TestView.resx">
+      <DependentUpon>TestView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs
===================================================================
diff -u -r67980a5c3c5cb71c185278e849b123e7f92990eb -rd212065881d696420fd33c789c917501e09c7fc0
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs	(.../DotSpatialGuiPluginTest.cs)	(revision 67980a5c3c5cb71c185278e849b123e7f92990eb)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs	(.../DotSpatialGuiPluginTest.cs)	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Windows;
-using System.Windows.Forms;
 using Core.Common.Base.Storage;
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.Designer.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.Designer.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.Designer.cs	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -0,0 +1,56 @@
+namespace Core.Common.Test.TestObjects
+{
+    partial class TestView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(3, 3);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(74, 20);
+            this.textBox1.TabIndex = 0;
+            // 
+            // TestView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.textBox1);
+            this.Name = "TestView";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBox1;
+    }
+}
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.cs	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -0,0 +1,22 @@
+using System.Windows.Forms;
+using Core.Common.Controls.Views;
+
+namespace Core.Common.Test.TestObjects
+{
+    public partial class TestView : UserControl, IView
+    {
+        public TestView()
+        {
+            InitializeComponent();
+        }
+
+        public object Data { get; set; }
+    }
+
+    public class TestViewDerivative : TestView {}
+
+    public class TestWrapper
+    {
+        public string RealData { get; set; }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.resx
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.resx	(revision 0)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.resx	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Ringtoets.sln
===================================================================
diff -u -ra65bc56647a666fad39e7fe48fbce3a5c040dfee -rd212065881d696420fd33c789c917501e09c7fc0
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision d212065881d696420fd33c789c917501e09c7fc0)
@@ -104,8 +104,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Service.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Service.Test\Ringtoets.Piping.Service.Test.csproj", "{D783543B-46A1-4848-A812-AF5A5259ED7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Test", "Core\Common\test\Core.Common.Test\Core.Common.Test.csproj", "{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Integration.Test", "Core\Common\test\Core.Common.Integration.Test\Core.Common.Integration.Test.csproj", "{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Application.Ringtoets.Setup", "Application\Ringtoets\src\Application.Ringtoets.Setup\Application.Ringtoets.Setup.wixproj", "{3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}"
@@ -460,14 +458,6 @@
 		{D783543B-46A1-4848-A812-AF5A5259ED7E}.Release|x86.Build.0 = Release|x86
 		{D783543B-46A1-4848-A812-AF5A5259ED7E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{D783543B-46A1-4848-A812-AF5A5259ED7E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Debug|x86.ActiveCfg = Debug|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Debug|x86.Build.0 = Debug|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Release|x86.ActiveCfg = Release|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Release|x86.Build.0 = Release|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 		{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.CreateInstaller|x86.ActiveCfg = Release|x86
 		{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.Debug|x86.ActiveCfg = Debug|x86
@@ -828,28 +818,27 @@
 		{041EDC04-3A1E-4FBA-BEB7-F391571C609F} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9}
 		{F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9}
 		{11FE8C37-49EB-4FF2-8583-DABC9816FFC8} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9}
-		{8261CCE1-98D7-465B-BC94-4ED239DE7F2E} = {9E35F3EA-D3C3-4D80-8399-689C49B68324}
 		{0D9858E1-CF2D-4DE5-AC0E-64401900D531} = {9E35F3EA-D3C3-4D80-8399-689C49B68324}
+		{8261CCE1-98D7-465B-BC94-4ED239DE7F2E} = {9E35F3EA-D3C3-4D80-8399-689C49B68324}
 		{4B4F0984-5730-4E28-93E7-DDE0F29BA550} = {FE36E7E0-D5F7-48E3-9730-D05443351EAD}
 		{209AC67F-DCFA-4355-B45A-9D9A2E4593D2} = {FE36E7E0-D5F7-48E3-9730-D05443351EAD}
 		{39EB5D07-C076-484C-9621-B34C4E5BF64C} = {85F88AB0-CA03-48D3-B5A0-DF0848C24AB0}
 		{EE8D5A6C-4871-452A-A69B-F04E374D715E} = {85F88AB0-CA03-48D3-B5A0-DF0848C24AB0}
-		{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
-		{30E4C2AE-719E-4D70-9FA9-668A9767FBFA} = {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}
-		{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
+		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{7F937E31-02CA-41D9-B7D4-1079CF452C72} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{D749EE4C-CE50-4C17-BF01-9A953028C126} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
-		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{A8CE1456-1880-4FC8-84B3-D618EA88F384} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{FAF691DE-EAF5-44E0-A865-5A03FB395ED1} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{0EDC6D7D-E9CD-408A-9EA9-3E7D426809C8} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
+		{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
+		{30E4C2AE-719E-4D70-9FA9-668A9767FBFA} = {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}
+		{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
 		{ED20DBA9-D577-423F-A68D-A0A8130FB10B} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
 		{4163B996-3455-4324-A38A-9F2F0E6FCB52} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}