Index: trunk/tools/HL3Snippets/HL3.License.snippet
===================================================================
--- trunk/tools/HL3Snippets/HL3.License.snippet	(revision 5387)
+++ trunk/tools/HL3Snippets/HL3.License.snippet	(revision 5388)
@@ -21,5 +21,5 @@
           <Type />
           <ToolTip>Enter the actual year</ToolTip>
-          <Default>2010</Default>
+          <Default>2011</Default>
           <Function></Function>
         </Literal>
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/HeuristicLab.VS2010Wizards.Test.csproj
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/HeuristicLab.VS2010Wizards.Test.csproj	(revision 5387)
+++ trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/HeuristicLab.VS2010Wizards.Test.csproj	(revision 5388)
@@ -97,24 +97,4 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Program.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Program.cs	(revision 5387)
+++ trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Program.cs	(revision 5388)
@@ -1,5 +1,3 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 
@@ -13,5 +11,5 @@
       Application.EnableVisualStyles();
       Application.SetCompatibleTextRenderingDefault(false);
-      Application.Run(new ProblemWizardForm());
+      Application.Run(new ViewWizardForm());
     }
   }
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Resources.Designer.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Resources.Designer.cs	(revision 5387)
+++ 	(revision )
@@ -1,63 +1,0 @@
-﻿//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HeuristicLab.VS2010Wizards.Test.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.VS2010Wizards.Test.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Resources.resx
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Resources.resx	(revision 5387)
+++ 	(revision )
@@ -1,117 +1,0 @@
-﻿<?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.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: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" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </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" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </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>
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Settings.Designer.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Settings.Designer.cs	(revision 5387)
+++ 	(revision )
@@ -1,26 +1,0 @@
-﻿//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HeuristicLab.VS2010Wizards.Test.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Settings.settings
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/Properties/Settings.settings	(revision 5387)
+++ 	(revision )
@@ -1,7 +1,0 @@
-﻿<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/app.config
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards.Test/app.config	(revision 5387)
+++ 	(revision )
@@ -1,3 +1,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards/ProblemWizardForm.Designer.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards/ProblemWizardForm.Designer.cs	(revision 5387)
+++ trunk/tools/Templates/HeuristicLab.VS2010Wizards/ProblemWizardForm.Designer.cs	(revision 5388)
@@ -37,15 +37,15 @@
       this.page2Panel = new System.Windows.Forms.Panel();
       this.label3 = new System.Windows.Forms.Label();
+      this.parametersControl = new HeuristicLab.VS2010Wizards.ParametersControl();
       this.panel2 = new System.Windows.Forms.Panel();
       this.nextButton = new System.Windows.Forms.Button();
       this.previousButton = new System.Windows.Forms.Button();
       this.page1Panel = new System.Windows.Forms.Panel();
-      this.singleObjectiveCheckBox = new System.Windows.Forms.CheckBox();
-      this.contentPanel = new System.Windows.Forms.Panel();
       this.solutionCreatorTypeTextBox = new System.Windows.Forms.TextBox();
       this.evaluatorTypeTextBox = new System.Windows.Forms.TextBox();
       this.label6 = new System.Windows.Forms.Label();
       this.label5 = new System.Windows.Forms.Label();
-      this.parametersControl = new HeuristicLab.VS2010Wizards.ParametersControl();
+      this.singleObjectiveCheckBox = new System.Windows.Forms.CheckBox();
+      this.contentPanel = new System.Windows.Forms.Panel();
       this.panel1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -177,4 +177,14 @@
       this.label3.TabIndex = 1;
       this.label3.Text = "Parameters:";
+      // 
+      // parametersControl
+      // 
+      this.parametersControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.parametersControl.Location = new System.Drawing.Point(0, 33);
+      this.parametersControl.Name = "parametersControl";
+      this.parametersControl.Size = new System.Drawing.Size(676, 260);
+      this.parametersControl.TabIndex = 0;
       // 
       // panel2
@@ -230,4 +240,44 @@
       this.page1Panel.TabIndex = 9;
       // 
+      // solutionCreatorTypeTextBox
+      // 
+      this.solutionCreatorTypeTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
+      this.solutionCreatorTypeTextBox.Location = new System.Drawing.Point(103, 236);
+      this.solutionCreatorTypeTextBox.Name = "solutionCreatorTypeTextBox";
+      this.solutionCreatorTypeTextBox.Size = new System.Drawing.Size(468, 20);
+      this.solutionCreatorTypeTextBox.TabIndex = 8;
+      this.solutionCreatorTypeTextBox.Text = "IMyProblemSolutionCreator";
+      this.solutionCreatorTypeTextBox.TextChanged += new System.EventHandler(this.solutionCreatorTypeTextBox_TextChanged);
+      // 
+      // evaluatorTypeTextBox
+      // 
+      this.evaluatorTypeTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
+      this.evaluatorTypeTextBox.Location = new System.Drawing.Point(103, 197);
+      this.evaluatorTypeTextBox.Name = "evaluatorTypeTextBox";
+      this.evaluatorTypeTextBox.Size = new System.Drawing.Size(468, 20);
+      this.evaluatorTypeTextBox.TabIndex = 9;
+      this.evaluatorTypeTextBox.Text = "IMyProblemEvaluator";
+      this.evaluatorTypeTextBox.TextChanged += new System.EventHandler(this.evaluatorTypeTextBox_TextChanged);
+      // 
+      // label6
+      // 
+      this.label6.Anchor = System.Windows.Forms.AnchorStyles.None;
+      this.label6.AutoSize = true;
+      this.label6.Location = new System.Drawing.Point(100, 220);
+      this.label6.Name = "label6";
+      this.label6.Size = new System.Drawing.Size(112, 13);
+      this.label6.TabIndex = 6;
+      this.label6.Text = "Solution Creator Type:";
+      // 
+      // label5
+      // 
+      this.label5.Anchor = System.Windows.Forms.AnchorStyles.None;
+      this.label5.AutoSize = true;
+      this.label5.Location = new System.Drawing.Point(100, 181);
+      this.label5.Name = "label5";
+      this.label5.Size = new System.Drawing.Size(82, 13);
+      this.label5.TabIndex = 7;
+      this.label5.Text = "Evaluator Type:";
+      // 
       // singleObjectiveCheckBox
       // 
@@ -255,54 +305,4 @@
       this.contentPanel.Size = new System.Drawing.Size(676, 293);
       this.contentPanel.TabIndex = 11;
-      // 
-      // solutionCreatorTypeTextBox
-      // 
-      this.solutionCreatorTypeTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-      this.solutionCreatorTypeTextBox.Location = new System.Drawing.Point(103, 236);
-      this.solutionCreatorTypeTextBox.Name = "solutionCreatorTypeTextBox";
-      this.solutionCreatorTypeTextBox.Size = new System.Drawing.Size(468, 20);
-      this.solutionCreatorTypeTextBox.TabIndex = 8;
-      this.solutionCreatorTypeTextBox.Text = "IMyProblemSolutionCreator";
-      this.solutionCreatorTypeTextBox.TextChanged += new System.EventHandler(this.solutionCreatorTypeTextBox_TextChanged);
-      // 
-      // evaluatorTypeTextBox
-      // 
-      this.evaluatorTypeTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-      this.evaluatorTypeTextBox.Location = new System.Drawing.Point(103, 197);
-      this.evaluatorTypeTextBox.Name = "evaluatorTypeTextBox";
-      this.evaluatorTypeTextBox.Size = new System.Drawing.Size(468, 20);
-      this.evaluatorTypeTextBox.TabIndex = 9;
-      this.evaluatorTypeTextBox.Text = "IMyProblemEvaluator";
-      this.evaluatorTypeTextBox.TextChanged += new System.EventHandler(this.evaluatorTypeTextBox_TextChanged);
-      // 
-      // label6
-      // 
-      this.label6.Anchor = System.Windows.Forms.AnchorStyles.None;
-      this.label6.AutoSize = true;
-      this.label6.Location = new System.Drawing.Point(100, 220);
-      this.label6.Name = "label6";
-      this.label6.Size = new System.Drawing.Size(112, 13);
-      this.label6.TabIndex = 6;
-      this.label6.Text = "Solution Creator Type:";
-      // 
-      // label5
-      // 
-      this.label5.Anchor = System.Windows.Forms.AnchorStyles.None;
-      this.label5.AutoSize = true;
-      this.label5.Location = new System.Drawing.Point(100, 181);
-      this.label5.Name = "label5";
-      this.label5.Size = new System.Drawing.Size(82, 13);
-      this.label5.TabIndex = 7;
-      this.label5.Text = "Evaluator Type:";
-      // 
-      // parametersControl
-      // 
-      this.parametersControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.parametersControl.Location = new System.Drawing.Point(0, 33);
-      this.parametersControl.Name = "parametersControl";
-      this.parametersControl.Size = new System.Drawing.Size(676, 260);
-      this.parametersControl.TabIndex = 0;
       // 
       // ProblemWizardForm
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizard.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizard.cs	(revision 5387)
+++ trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizard.cs	(revision 5388)
@@ -49,7 +49,7 @@
     public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams) {
       if (form.ShowDialog() == System.Windows.Forms.DialogResult.OK) {
-        replacementsDictionary.Add("$baseClass$", form.BaseClass);
-        replacementsDictionary.Add("$viewContentType$", form.ViewContentType);
-        replacementsDictionary.Add("$isDefaultView$", form.IsDefaultView.ToString().ToLower());
+        replacementsDictionary.Add("$viewName$", form.ViewName);
+        replacementsDictionary.Add("$contentType$", form.ContentType);
+        replacementsDictionary.Add("$defaultView$", form.IsDefault.ToString().ToLower());
         shouldAddItem = true;
       } else shouldAddItem = false;
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizardForm.Designer.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizardForm.Designer.cs	(revision 5387)
+++ trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizardForm.Designer.cs	(revision 5388)
@@ -46,99 +46,150 @@
     private void InitializeComponent() {
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewWizardForm));
-      this.okButton = new System.Windows.Forms.Button();
+      this.baseClassLabel = new System.Windows.Forms.Label();
+      this.contentTypeTextBox = new System.Windows.Forms.TextBox();
+      this.defaultViewCheckBox = new System.Windows.Forms.CheckBox();
+      this.label2 = new System.Windows.Forms.Label();
+      this.panel1 = new System.Windows.Forms.Panel();
+      this.label4 = new System.Windows.Forms.Label();
+      this.pictureBox1 = new System.Windows.Forms.PictureBox();
       this.cancelButton = new System.Windows.Forms.Button();
-      this.baseClassLabel = new System.Windows.Forms.Label();
-      this.baseClassTextBox = new System.Windows.Forms.TextBox();
+      this.finishButton = new System.Windows.Forms.Button();
+      this.panel2 = new System.Windows.Forms.Panel();
       this.label1 = new System.Windows.Forms.Label();
-      this.isDefaultViewCheckBox = new System.Windows.Forms.CheckBox();
-      this.viewContentTypeTextBox = new System.Windows.Forms.TextBox();
-      this.label2 = new System.Windows.Forms.Label();
-      this.label3 = new System.Windows.Forms.Label();
+      this.nameTextBox = new System.Windows.Forms.TextBox();
+      this.panel1.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
       this.SuspendLayout();
       // 
-      // okButton
-      // 
-      this.okButton.Location = new System.Drawing.Point(10, 135);
-      this.okButton.Name = "okButton";
-      this.okButton.Size = new System.Drawing.Size(75, 23);
-      this.okButton.TabIndex = 6;
-      this.okButton.Text = "Ok";
-      this.okButton.UseVisualStyleBackColor = true;
-      this.okButton.Click += new System.EventHandler(this.okButton_Click);
+      // baseClassLabel
+      // 
+      this.baseClassLabel.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.baseClassLabel.AutoSize = true;
+      this.baseClassLabel.Location = new System.Drawing.Point(74, 157);
+      this.baseClassLabel.Name = "baseClassLabel";
+      this.baseClassLabel.Size = new System.Drawing.Size(85, 13);
+      this.baseClassLabel.TabIndex = 0;
+      this.baseClassLabel.Text = "Content Type(s):";
+      // 
+      // contentTypeTextBox
+      // 
+      this.contentTypeTextBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.contentTypeTextBox.Location = new System.Drawing.Point(77, 173);
+      this.contentTypeTextBox.Name = "contentTypeTextBox";
+      this.contentTypeTextBox.Size = new System.Drawing.Size(313, 20);
+      this.contentTypeTextBox.TabIndex = 1;
+      this.contentTypeTextBox.Text = "IItem";
+      this.contentTypeTextBox.TextChanged += new System.EventHandler(this.contentTypeTextBox_TextChanged);
+      // 
+      // defaultViewCheckBox
+      // 
+      this.defaultViewCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.defaultViewCheckBox.AutoSize = true;
+      this.defaultViewCheckBox.Location = new System.Drawing.Point(396, 175);
+      this.defaultViewCheckBox.Name = "defaultViewCheckBox";
+      this.defaultViewCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No;
+      this.defaultViewCheckBox.Size = new System.Drawing.Size(60, 17);
+      this.defaultViewCheckBox.TabIndex = 4;
+      this.defaultViewCheckBox.Text = "Default";
+      this.defaultViewCheckBox.UseVisualStyleBackColor = true;
+      this.defaultViewCheckBox.CheckedChanged += new System.EventHandler(this.isDefaultViewCheckBox_CheckedChanged);
+      this.defaultViewCheckBox.TextChanged += new System.EventHandler(this.isDefaultViewCheckBox_CheckedChanged);
+      // 
+      // label2
+      // 
+      this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.label2.Location = new System.Drawing.Point(74, 207);
+      this.label2.Name = "label2";
+      this.label2.Size = new System.Drawing.Size(382, 32);
+      this.label2.TabIndex = 5;
+      this.label2.Text = "Warning: Only one view can be default for a certain content type. If there is mor" +
+          "e than one default view, the application will crash.";
+      // 
+      // panel1
+      // 
+      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel1.BackColor = System.Drawing.Color.White;
+      this.panel1.Controls.Add(this.label4);
+      this.panel1.Controls.Add(this.pictureBox1);
+      this.panel1.Location = new System.Drawing.Point(0, 1);
+      this.panel1.Name = "panel1";
+      this.panel1.Size = new System.Drawing.Size(533, 81);
+      this.panel1.TabIndex = 9;
+      // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Font = new System.Drawing.Font("Calibri", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      this.label4.Location = new System.Drawing.Point(24, 21);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(245, 39);
+      this.label4.TabIndex = 1;
+      this.label4.Text = "New View Wizard";
+      // 
+      // pictureBox1
+      // 
+      this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.pictureBox1.Image = global::HeuristicLab.VS2010Wizards.Properties.Resources.HL3_Logo;
+      this.pictureBox1.Location = new System.Drawing.Point(455, 3);
+      this.pictureBox1.Name = "pictureBox1";
+      this.pictureBox1.Size = new System.Drawing.Size(75, 75);
+      this.pictureBox1.TabIndex = 0;
+      this.pictureBox1.TabStop = false;
       // 
       // cancelButton
       // 
-      this.cancelButton.Location = new System.Drawing.Point(92, 135);
+      this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+      this.cancelButton.Location = new System.Drawing.Point(446, 305);
       this.cancelButton.Name = "cancelButton";
-      this.cancelButton.Size = new System.Drawing.Size(75, 23);
-      this.cancelButton.TabIndex = 7;
+      this.cancelButton.Size = new System.Drawing.Size(75, 25);
+      this.cancelButton.TabIndex = 12;
       this.cancelButton.Text = "Cancel";
       this.cancelButton.UseVisualStyleBackColor = true;
       this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
       // 
-      // baseClassLabel
-      // 
-      this.baseClassLabel.AutoSize = true;
-      this.baseClassLabel.Location = new System.Drawing.Point(7, 15);
-      this.baseClassLabel.Name = "baseClassLabel";
-      this.baseClassLabel.Size = new System.Drawing.Size(59, 13);
-      this.baseClassLabel.TabIndex = 0;
-      this.baseClassLabel.Text = "BaseClass:";
-      // 
-      // baseClassTextBox
-      // 
-      this.baseClassTextBox.Location = new System.Drawing.Point(113, 12);
-      this.baseClassTextBox.Name = "baseClassTextBox";
-      this.baseClassTextBox.Size = new System.Drawing.Size(161, 20);
-      this.baseClassTextBox.TabIndex = 1;
-      this.baseClassTextBox.Text = "ItemView";
-      this.baseClassTextBox.TextChanged += new System.EventHandler(this.baseClassTextBox_TextChanged);
+      // finishButton
+      // 
+      this.finishButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.finishButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+      this.finishButton.Location = new System.Drawing.Point(361, 305);
+      this.finishButton.Name = "finishButton";
+      this.finishButton.Size = new System.Drawing.Size(75, 25);
+      this.finishButton.TabIndex = 11;
+      this.finishButton.Text = "Finish";
+      this.finishButton.UseVisualStyleBackColor = true;
+      this.finishButton.Click += new System.EventHandler(this.finishButton_Click);
+      // 
+      // panel2
+      // 
+      this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel2.BackColor = System.Drawing.Color.White;
+      this.panel2.ForeColor = System.Drawing.SystemColors.ControlText;
+      this.panel2.Location = new System.Drawing.Point(0, 297);
+      this.panel2.Name = "panel2";
+      this.panel2.Size = new System.Drawing.Size(533, 2);
+      this.panel2.TabIndex = 13;
       // 
       // label1
       // 
+      this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
       this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(7, 41);
+      this.label1.Location = new System.Drawing.Point(74, 112);
       this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(100, 13);
-      this.label1.TabIndex = 2;
-      this.label1.Text = "View Content Type:";
-      // 
-      // isDefaultViewCheckBox
-      // 
-      this.isDefaultViewCheckBox.AutoSize = true;
-      this.isDefaultViewCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-      this.isDefaultViewCheckBox.Location = new System.Drawing.Point(113, 64);
-      this.isDefaultViewCheckBox.Name = "isDefaultViewCheckBox";
-      this.isDefaultViewCheckBox.Size = new System.Drawing.Size(15, 14);
-      this.isDefaultViewCheckBox.TabIndex = 4;
-      this.isDefaultViewCheckBox.UseVisualStyleBackColor = true;
-      this.isDefaultViewCheckBox.CheckedChanged += new System.EventHandler(this.isDefaultViewCheckBox_CheckedChanged);
-      // 
-      // viewContentTypeTextBox
-      // 
-      this.viewContentTypeTextBox.Location = new System.Drawing.Point(113, 38);
-      this.viewContentTypeTextBox.Name = "viewContentTypeTextBox";
-      this.viewContentTypeTextBox.Size = new System.Drawing.Size(162, 20);
-      this.viewContentTypeTextBox.TabIndex = 3;
-      this.viewContentTypeTextBox.Text = "Item";
-      this.viewContentTypeTextBox.TextChanged += new System.EventHandler(this.viewContentTypeTextBox_TextChanged);
-      // 
-      // label2
-      // 
-      this.label2.Location = new System.Drawing.Point(10, 84);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(265, 48);
-      this.label2.TabIndex = 5;
-      this.label2.Text = "Warning: Only one view can be default for a certain content type. If there is mor" +
-          "e than one default view, the application will crash.";
-      // 
-      // label3
-      // 
-      this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(7, 64);
-      this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(70, 13);
-      this.label3.TabIndex = 2;
-      this.label3.Text = "Default View:";
+      this.label1.Size = new System.Drawing.Size(38, 13);
+      this.label1.TabIndex = 14;
+      this.label1.Text = "Name:";
+      // 
+      // nameTextBox
+      // 
+      this.nameTextBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.nameTextBox.Location = new System.Drawing.Point(77, 128);
+      this.nameTextBox.Name = "nameTextBox";
+      this.nameTextBox.Size = new System.Drawing.Size(379, 20);
+      this.nameTextBox.TabIndex = 15;
+      this.nameTextBox.Text = "My View";
+      this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
       // 
       // ViewWizardForm
@@ -146,17 +197,22 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(286, 168);
+      this.CancelButton = this.cancelButton;
+      this.ClientSize = new System.Drawing.Size(533, 342);
+      this.Controls.Add(this.defaultViewCheckBox);
+      this.Controls.Add(this.contentTypeTextBox);
+      this.Controls.Add(this.label1);
+      this.Controls.Add(this.nameTextBox);
+      this.Controls.Add(this.panel2);
+      this.Controls.Add(this.cancelButton);
+      this.Controls.Add(this.finishButton);
+      this.Controls.Add(this.panel1);
       this.Controls.Add(this.label2);
-      this.Controls.Add(this.viewContentTypeTextBox);
-      this.Controls.Add(this.isDefaultViewCheckBox);
-      this.Controls.Add(this.baseClassTextBox);
-      this.Controls.Add(this.label3);
-      this.Controls.Add(this.label1);
       this.Controls.Add(this.baseClassLabel);
-      this.Controls.Add(this.cancelButton);
-      this.Controls.Add(this.okButton);
       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
       this.Name = "ViewWizardForm";
       this.Text = "New View Wizard";
+      this.panel1.ResumeLayout(false);
+      this.panel1.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -166,13 +222,16 @@
     #endregion
 
-    private System.Windows.Forms.Button okButton;
+    private System.Windows.Forms.Label baseClassLabel;
+    private System.Windows.Forms.TextBox contentTypeTextBox;
+    private System.Windows.Forms.CheckBox defaultViewCheckBox;
+    private System.Windows.Forms.Label label2;
+    private System.Windows.Forms.Panel panel1;
+    private System.Windows.Forms.Label label4;
+    private System.Windows.Forms.PictureBox pictureBox1;
     private System.Windows.Forms.Button cancelButton;
-    private System.Windows.Forms.Label baseClassLabel;
-    private System.Windows.Forms.TextBox baseClassTextBox;
+    private System.Windows.Forms.Button finishButton;
+    private System.Windows.Forms.Panel panel2;
     private System.Windows.Forms.Label label1;
-    private System.Windows.Forms.CheckBox isDefaultViewCheckBox;
-    private System.Windows.Forms.TextBox viewContentTypeTextBox;
-    private System.Windows.Forms.Label label2;
-    private System.Windows.Forms.Label label3;
+    private System.Windows.Forms.TextBox nameTextBox;
 
   }
Index: trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizardForm.cs
===================================================================
--- trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizardForm.cs	(revision 5387)
+++ trunk/tools/Templates/HeuristicLab.VS2010Wizards/ViewWizardForm.cs	(revision 5388)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24,13 +24,23 @@
 namespace HeuristicLab.VS2010Wizards {
   public partial class ViewWizardForm : Form {
-    public string BaseClass {
-      get;
-      private set;
+    private string viewName;
+    public string ViewName {
+      get { return viewName; }
+      set {
+        viewName = value;
+        if (nameTextBox.Text != viewName)
+          nameTextBox.Text = viewName;
+      }
     }
-    public string ViewContentType {
-      get;
-      private set;
+    private string contentType;
+    public string ContentType {
+      get { return contentType; }
+      set {
+        contentType = value;
+        if (contentTypeTextBox.Text != contentType)
+          contentTypeTextBox.Text = contentType;
+      }
     }
-    public bool IsDefaultView {
+    public bool IsDefault {
       get;
       private set;
@@ -39,29 +49,27 @@
     public ViewWizardForm() {
       InitializeComponent();
-      BaseClass = baseClassTextBox.Text;
-      ViewContentType = viewContentTypeTextBox.Text;
-      IsDefaultView = isDefaultViewCheckBox.Checked;
+      ViewName = nameTextBox.Text;
+      ContentType = contentTypeTextBox.Text;
+      IsDefault = defaultViewCheckBox.Checked;
     }
 
-    private void okButton_Click(object sender, System.EventArgs e) {
-      DialogResult = System.Windows.Forms.DialogResult.OK;
+    private void finishButton_Click(object sender, System.EventArgs e) {
       Close();
     }
 
     private void cancelButton_Click(object sender, System.EventArgs e) {
-      DialogResult = System.Windows.Forms.DialogResult.Cancel;
       Close();
     }
 
-    private void baseClassTextBox_TextChanged(object sender, System.EventArgs e) {
-      BaseClass = baseClassTextBox.Text;
-    }
-
-    private void viewContentTypeTextBox_TextChanged(object sender, System.EventArgs e) {
-      ViewContentType = viewContentTypeTextBox.Text;
+    private void contentTypeTextBox_TextChanged(object sender, System.EventArgs e) {
+      ContentType = contentTypeTextBox.Text;
     }
 
     private void isDefaultViewCheckBox_CheckedChanged(object sender, System.EventArgs e) {
-      IsDefaultView = isDefaultViewCheckBox.Checked;
+      IsDefault = defaultViewCheckBox.Checked;
+    }
+
+    private void nameTextBox_TextChanged(object sender, System.EventArgs e) {
+      ViewName = nameTextBox.Text;
     }
   }
Index: trunk/tools/Templates/HeuristicLabVS2010WizardsInstaller/HeuristicLabVS2010WizardsInstaller.vdproj
===================================================================
--- trunk/tools/Templates/HeuristicLabVS2010WizardsInstaller/HeuristicLabVS2010WizardsInstaller.vdproj	(revision 5387)
+++ trunk/tools/Templates/HeuristicLabVS2010WizardsInstaller/HeuristicLabVS2010WizardsInstaller.vdproj	(revision 5388)
@@ -22,4 +22,16 @@
         "Entry"
         {
+        "MsmKey" = "8:_27C2EA4FA458C274F278396DE22A506E"
+        "OwnerKey" = "8:_B18E711B0E107FDA96359FC0783B671F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_27C2EA4FA458C274F278396DE22A506E"
+        "OwnerKey" = "8:_B51E170D986C45DD9BBEEC6B70686DC9"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_A7EAC0AA402C433C8EEB32377FBD8490"
         "OwnerKey" = "8:_UNDEFINED"
@@ -78,4 +90,10 @@
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_B18E711B0E107FDA96359FC0783B671F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_27C2EA4FA458C274F278396DE22A506E"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -202,4 +220,35 @@
             "Tag" = "8:"
             "Folder" = "8:_7BCDA8FA05FB46E09F9715E4F125F191"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_27C2EA4FA458C274F278396DE22A506E"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_27C2EA4FA458C274F278396DE22A506E"
+                    {
+                    "Name" = "8:stdole.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:stdole.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_6C9F753281594A1483F7199C4F19C6D8"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
@@ -450,5 +499,5 @@
         "ProductName" = "8:HeuristicLab 3.3 VS2010 Wizards"
         "ProductCode" = "8:{B99828C4-2D65-461D-B13C-CAB57EAB6AC1}"
-        "PackageCode" = "8:{F12DCE28-7303-41AE-9C8D-231C0F1DA713}"
+        "PackageCode" = "8:{BAE7C376-6630-4965-ADD0-80719F63615E}"
         "UpgradeCode" = "8:{3AF928E8-1C64-4A5A-BC16-44CD128F21D3}"
         "AspNetVersion" = "8:4.0.30319.0"
@@ -938,5 +987,5 @@
             "Hidden" = "11:FALSE"
             "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
+            "Permanent" = "11:TRUE"
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
Index: trunk/tools/Templates/HeuristicLabViewTemplate/DefaultView.cs
===================================================================
--- trunk/tools/Templates/HeuristicLabViewTemplate/DefaultView.cs	(revision 5387)
+++ trunk/tools/Templates/HeuristicLabViewTemplate/DefaultView.cs	(revision 5388)
@@ -22,13 +22,13 @@
 using System;
 using System.Windows.Forms;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace $rootnamespace$ {
-  [View("$safeitemname$")]
-  [Content(typeof($viewContentType$), IsDefaultView = $isDefaultView$)]
-  public partial class $safeitemname$ : $baseClass$ {
-    public new $viewContentType$ Content {
-      get { return ($viewContentType$)base.Content; }
+  [View("$viewName$")]
+  [Content(typeof($contentType$), IsDefaultView = $defaultView$)]
+  public partial class $safeitemname$ : AsynchronousContentView {
+    public new $contentType$ Content {
+      get { return ($contentType$)base.Content; }
       set { base.Content = value; }
     }
Index: trunk/tools/Templates/VS2010Wizards.sln
===================================================================
--- trunk/tools/Templates/VS2010Wizards.sln	(revision 5387)
+++ trunk/tools/Templates/VS2010Wizards.sln	(revision 5388)
@@ -53,16 +53,16 @@
 		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Debug|x86.Build.0 = Debug|Any CPU
-		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Release|Any CPU.ActiveCfg = Release|x86
-		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Release|Any CPU.Build.0 = Release|x86
+		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Debug|x86.ActiveCfg = Debug|x86
+		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Debug|x86.Build.0 = Debug|x86
+		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Release|x86.ActiveCfg = Release|x86
 		{F1B37418-F66E-41C0-BC36-B9A02BBAF62D}.Release|x86.Build.0 = Release|x86
 		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Debug|x86.Build.0 = Debug|Any CPU
-		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Release|Any CPU.ActiveCfg = Release|x86
-		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Release|Any CPU.Build.0 = Release|x86
+		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Debug|x86.ActiveCfg = Debug|x86
+		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Debug|x86.Build.0 = Debug|x86
+		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Release|x86.ActiveCfg = Release|x86
 		{5908CE89-79AC-4CFC-ADA9-7D73A1D03DC4}.Release|x86.Build.0 = Release|x86
