Index: Application/Riskeer/src/Application.Riskeer/App.cs
===================================================================
diff -u -rf7aee065e3b5739b83fca8f9fc3c0b98f6d99170 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- Application/Riskeer/src/Application.Riskeer/App.cs	(.../App.cs)	(revision f7aee065e3b5739b83fca8f9fc3c0b98f6d99170)
+++ Application/Riskeer/src/Application.Riskeer/App.cs	(.../App.cs)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -66,7 +66,7 @@
 
 namespace Application.Riskeer
 {
-    // Partial class introduced for avoiding problems in relation to dynamically resolving assemblies
+    // Partial class introduced for avoiding problems related to dynamically resolving assemblies
     // (SetupAssemblyResolver must be called before any dependencies are needed).
     public partial class App
     {
@@ -75,14 +75,11 @@
 
         private const int numberOfDaysToKeepLogFiles = 30;
 
+        private static int waitForProcessId = -1;
+        private static Mutex singleInstanceMutex;
         private static string fileToOpen = string.Empty;
 
-        private static Mutex singleInstanceMutex;
-
-        private static int waitForProcessId = -1;
-
         private ILog log;
-
         private GuiCore gui;
 
         private delegate void ExceptionDelegate(Exception exception);
@@ -111,8 +108,6 @@
         {
             ParseArguments(e.Args);
 
-            Resources.Add(SystemParameters.MenuPopupAnimationKey, PopupAnimation.None);
-
             WaitForPreviousInstanceToExit();
             if (IsNotFirstInstance())
             {
@@ -123,6 +118,8 @@
 
             DeleteOldLogFiles();
 
+            Resources.Add(SystemParameters.MenuPopupAnimationKey, PopupAnimation.None);
+            
             var settings = new GuiCoreSettings
             {
                 SupportEmailAddress = "www.helpdeskwater.nl",
Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj
===================================================================
diff -u -r57c7bff14ea79d4dc7196ad86323f2d300ecc589 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 57c7bff14ea79d4dc7196ad86323f2d300ecc589)
+++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -91,7 +91,7 @@
   </Target>
   <!-- Overwrite PostBuildCopyAssembly, because no dll's or pdb's to copy here. -->
   <Target Name="PostBuildCopyAssembly" AfterTargets="PostBuildEvent" />
-  <!-- make all references non-private, so they won't be copied to the output folder. -->
+  <!-- Make all references non-private, so they won't be copied to the output folder. -->
   <Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
     <ItemGroup>
       <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" />
Index: Application/Riskeer/src/Application.Riskeer/app.config
===================================================================
diff -u -r1a89098ebd57234ccea9377c898203741a543cf2 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- Application/Riskeer/src/Application.Riskeer/app.config	(.../app.config)	(revision 1a89098ebd57234ccea9377c898203741a543cf2)
+++ Application/Riskeer/src/Application.Riskeer/app.config	(.../app.config)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -26,16 +26,10 @@
 -->
 <configuration>
   <configSections>
-    <!-- <section name="castle" type="Castle.Windsor.Configuration.AppDomain.CastleSectionHandler, Castle.Windsor" /> -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <appSettings>
-    <!-- outputlog4net's debug information to the Visual Studio output debug window -->
-    <!-- <add key="log4net.Internal.Debug" value="true" /> -->
     <add key="language" value="nl" />
-    <!--<add key="language" value="nl-NL" />-->
-    <!-- check http://msdn.microsoft.com/en-us/goglobal/bb896001.aspx for a list of possible values -->
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>
@@ -51,7 +45,7 @@
     </roleManager>
   </system.web>
   <entityFramework>
-    <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"></defaultConnectionFactory>
+    <defaultConnectionFactory type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
     <providers>
       <provider invariantName="System.Data.SQLite" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
Index: Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs
===================================================================
diff -u -r3c64407303b0747af9311ce346df9d8966971956 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs	(.../AppTest.cs)	(revision 3c64407303b0747af9311ce346df9d8966971956)
+++ Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs	(.../AppTest.cs)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -24,7 +24,7 @@
 using System.Linq;
 using Core.Common.TestUtil;
 using Core.Common.Util.Settings;
-using NUnit.Framework;  
+using NUnit.Framework;
 using Riskeer.Integration.Forms;
 
 namespace Application.Riskeer.Test
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -20,7 +20,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Assembly\Core.Common.Assembly.csproj" />
     <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj" />
     <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj" />
     <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
Index: build/Source.targets
===================================================================
diff -u -ra88cd43eb780232edc2404f252e0f8d6adbad0ab -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- build/Source.targets	(.../Source.targets)	(revision a88cd43eb780232edc2404f252e0f8d6adbad0ab)
+++ build/Source.targets	(.../Source.targets)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -1,8 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <OutDir>$(OutputPath)</OutDir>
-    <OutputPath Condition="$(OutputPath) == ''">bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
   <Import Project="$(SolutionDir)build\Base.targets" />
   <PropertyGroup>
     <ContentSQLiteInteropFiles>false</ContentSQLiteInteropFiles>
Index: build/Test.targets
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- build/Test.targets	(.../Test.targets)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ build/Test.targets	(.../Test.targets)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <TestProjectType>UnitTest</TestProjectType>
-    <OutDir>$(OutputPath)</OutDir>
     <OutputPath>$(SolutionDir)\bin\$(Configuration)\Test</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
Index: build/TestUtil.targets
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r306534a774a4391bfb8c021ecda9b2ee1ce1d309
--- build/TestUtil.targets	(.../TestUtil.targets)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ build/TestUtil.targets	(.../TestUtil.targets)	(revision 306534a774a4391bfb8c021ecda9b2ee1ce1d309)
@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <OutDir>$(OutputPath)</OutDir>
     <OutputPath>$(SolutionDir)\bin\$(Configuration)\Test</OutputPath>
   </PropertyGroup>
   <Import Project="$(SolutionDir)build\Base.targets" />