Index: branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/AdminClientView.Designer.cs
===================================================================
--- branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/AdminClientView.Designer.cs	(revision 8037)
+++ 	(revision )
@@ -1,140 +1,0 @@
-﻿namespace HeuristicLab.Clients.Access.Views {
-  partial class AdminClientView {
-    /// <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.label12 = new System.Windows.Forms.Label();
-      this.txtCountry = new System.Windows.Forms.TextBox();
-      this.SuspendLayout();
-      // 
-      // txtName
-      // 
-      this.txtName.Size = new System.Drawing.Size(411, 20);
-      // 
-      // txtDescription
-      // 
-      this.txtDescription.Size = new System.Drawing.Size(410, 20);
-      // 
-      // txtVersion
-      // 
-      this.txtVersion.Size = new System.Drawing.Size(410, 20);
-      // 
-      // txtTimestamp
-      // 
-      this.txtTimestamp.Size = new System.Drawing.Size(411, 20);
-      // 
-      // txtMemory
-      // 
-      this.txtMemory.Size = new System.Drawing.Size(411, 20);
-      // 
-      // txtNumberOfCores
-      // 
-      this.txtNumberOfCores.Size = new System.Drawing.Size(411, 20);
-      // 
-      // txtClientType
-      // 
-      this.txtClientType.Size = new System.Drawing.Size(410, 20);
-      // 
-      // txtClientConfiguration
-      // 
-      this.txtClientConfiguration.Size = new System.Drawing.Size(411, 20);
-      // 
-      // txtProcessor
-      // 
-      this.txtProcessor.Size = new System.Drawing.Size(410, 20);
-      // 
-      // txtOS
-      // 
-      this.txtOS.Size = new System.Drawing.Size(410, 20);
-      // 
-      // txtPerformanceValue
-      // 
-      this.txtPerformanceValue.Size = new System.Drawing.Size(411, 20);
-      // 
-      // txtId
-      // 
-      this.txtId.Size = new System.Drawing.Size(410, 20);
-      // 
-      // label12
-      // 
-      this.label12.AutoSize = true;
-      this.label12.Location = new System.Drawing.Point(3, 318);
-      this.label12.Name = "label12";
-      this.label12.Size = new System.Drawing.Size(46, 13);
-      this.label12.TabIndex = 11;
-      this.label12.Text = "Country:";
-      // 
-      // txtCountry
-      // 
-      this.txtCountry.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.txtCountry.Location = new System.Drawing.Point(111, 315);
-      this.txtCountry.Name = "txtCountry";
-      this.txtCountry.Size = new System.Drawing.Size(410, 20);
-      this.txtCountry.TabIndex = 22;
-      // 
-      // AdminClientView
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.txtCountry);
-      this.Controls.Add(this.label12);
-      this.Name = "AdminClientView";
-      this.Size = new System.Drawing.Size(524, 341);
-      this.Controls.SetChildIndex(this.label1, 0);
-      this.Controls.SetChildIndex(this.label2, 0);
-      this.Controls.SetChildIndex(this.label3, 0);
-      this.Controls.SetChildIndex(this.label4, 0);
-      this.Controls.SetChildIndex(this.label5, 0);
-      this.Controls.SetChildIndex(this.label6, 0);
-      this.Controls.SetChildIndex(this.label7, 0);
-      this.Controls.SetChildIndex(this.label8, 0);
-      this.Controls.SetChildIndex(this.label9, 0);
-      this.Controls.SetChildIndex(this.label10, 0);
-      this.Controls.SetChildIndex(this.label11, 0);
-      this.Controls.SetChildIndex(this.txtName, 0);
-      this.Controls.SetChildIndex(this.txtDescription, 0);
-      this.Controls.SetChildIndex(this.txtVersion, 0);
-      this.Controls.SetChildIndex(this.txtTimestamp, 0);
-      this.Controls.SetChildIndex(this.txtMemory, 0);
-      this.Controls.SetChildIndex(this.txtNumberOfCores, 0);
-      this.Controls.SetChildIndex(this.txtClientType, 0);
-      this.Controls.SetChildIndex(this.txtClientConfiguration, 0);
-      this.Controls.SetChildIndex(this.txtProcessor, 0);
-      this.Controls.SetChildIndex(this.txtOS, 0);
-      this.Controls.SetChildIndex(this.txtPerformanceValue, 0);
-      this.Controls.SetChildIndex(this.label13, 0);
-      this.Controls.SetChildIndex(this.txtId, 0);
-      this.Controls.SetChildIndex(this.label12, 0);
-      this.Controls.SetChildIndex(this.txtCountry, 0);
-      this.ResumeLayout(false);
-      this.PerformLayout();
-
-    }
-
-    #endregion
-
-    private System.Windows.Forms.Label label12;
-    private System.Windows.Forms.TextBox txtCountry;
-  }
-}
Index: branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/AdminClientView.cs
===================================================================
--- branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/AdminClientView.cs	(revision 8037)
+++ 	(revision )
@@ -1,49 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using HeuristicLab.MainForm;
-
-namespace HeuristicLab.Clients.Access.Views {
-  [View("Extended Client View")]
-  [Content(typeof(Client), false)]
-  public partial class AdminClientView : ClientView {
-    public new Client Content {
-      get { return (Client)base.Content; }
-      set { base.Content = value; }
-    }
-
-    public AdminClientView() {
-      InitializeComponent();
-    }
-
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-
-      if (Content == null) {
-        txtCountry.Text = string.Empty;
-      } else {
-        if (Content.Country != null) {
-          txtCountry.Text = Content.Country.Name;
-        }
-      }
-    }
-  }
-}
Index: branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/HeuristicLab.Clients.Access.Views-3.3.csproj
===================================================================
--- branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/HeuristicLab.Clients.Access.Views-3.3.csproj	(revision 8037)
+++ branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/HeuristicLab.Clients.Access.Views-3.3.csproj	(revision 8039)
@@ -106,10 +106,4 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientViews\AdminClientView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ClientViews\AdminClientView.Designer.cs">
-      <DependentUpon>AdminClientView.cs</DependentUpon>
-    </Compile>
     <Compile Include="ClientViews\ClientInformationDialog.cs">
       <SubType>Form</SubType>
Index: branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.cs
===================================================================
--- branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.cs	(revision 8037)
+++ branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.cs	(revision 8039)
@@ -62,5 +62,4 @@
 
     void Instance_Refreshed(object sender, EventArgs e) {
-      //TODO: show loading bar
       if (AccessClient.Instance.UsersAndGroups != null)
         this.itemsListView.Enabled = true;
Index: branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs
===================================================================
--- branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs	(revision 8037)
+++ branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs	(revision 8039)
@@ -24,5 +24,4 @@
 
 namespace HeuristicLab.Clients.Access.Views {
-
   public partial class RefreshableLightweightUserInformationView : RefreshableView {
     public RefreshableLightweightUserInformationView() {
@@ -60,5 +59,6 @@
         lightweightUserInformationView.Enabled = true;
         if (!UserInformation.Instance.UserExists) {
-          MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine + "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error);
+          MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine +
+            "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error);
           lightweightUserInformationView.Content = null;
         } else {
