Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AdminController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AdminController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AdminController.cs	(revision 6317)
@@ -13,68 +13,68 @@
 
 namespace HLWebOKBAdminPlugin.Controllers {
-    public class AdminController : Controller {
-        private AdministrationServiceClient CertificateValidator() {
-            AdministrationServiceClient asc = new AdministrationServiceClient();
+  public class AdminController : Controller {
+    private AdministrationServiceClient CertificateValidator() {
+      AdministrationServiceClient asc = new AdministrationServiceClient();
 
-            asc.ClientCredentials.UserName.UserName = HttpContext.Session["Username"].ToString();
-            asc.ClientCredentials.UserName.Password = HttpContext.Session["Password"].ToString();
-            asc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+      asc.ClientCredentials.UserName.UserName = HttpContext.Session["Username"].ToString();
+      asc.ClientCredentials.UserName.Password = HttpContext.Session["Password"].ToString();
+      asc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
 
-            return asc;
-        }//CertificateValidator 
+      return asc;
+    }//CertificateValidator 
 
-        public ActionResult Index() {
-            return View();
-        }// ActionResult Index
+    public ActionResult Index() {
+      return View();
+    }// ActionResult Index
 
-        public ActionResult Menu() {
-            
-            return View();
-        }//ActionResult Men
+    public ActionResult Menu() {
 
-        public ActionResult AlgorithmClass() {
-            AdministrationServiceClient adminCLient = Admin.GetClientFactory();
+      return View();
+    }//ActionResult Men
 
-            AdminModel am = new AdminModel();
-            Session["SelectedSubMenu"] = "AlgorithmClass";
-            var algorithmClasses = am.AlgorithmClassProp;
+    public ActionResult AlgorithmClass() {
+      AdministrationServiceClient adminCLient = Admin.GetClientFactory();
 
-            return View(algorithmClasses);
-        }//ActionResult AlgorithmClassC:\SYS\profiles\schwgh\Desktop\WebApplication\MVC2\HLWebOKBAdminPlugin\Views\Admin\Algorithm.aspx
+      AdminModel am = new AdminModel();
+      Session["SelectedSubMenu"] = "AlgorithmClass";
+      var algorithmClasses = am.AlgorithmClassProp;
 
-        public ActionResult Algorithm() {
-            AdministrationServiceClient adminCLient = Admin.GetClientFactory();
+      return View(algorithmClasses);
+    }//ActionResult AlgorithmClassC:\SYS\profiles\schwgh\Desktop\WebApplication\MVC2\HLWebOKBAdminPlugin\Views\Admin\Algorithm.aspx
 
-            AdminModel am = new AdminModel();
-            Session["SelectedSubMenu"] = "Algorithm";
-            var algorithm = am.AlgorithmsGetAll();
+    public ActionResult Algorithm() {
+      AdministrationServiceClient adminCLient = Admin.GetClientFactory();
 
-            return View(algorithm);
-        }//Algorithm
+      AdminModel am = new AdminModel();
+      Session["SelectedSubMenu"] = "Algorithm";
+      var algorithm = am.AlgorithmsGetAll();
 
-        public ActionResult ProblemClass() {
-            AdministrationServiceClient adminCLient = Admin.GetClientFactory();
+      return View(algorithm);
+    }//Algorithm
 
-            AdminModel am = new AdminModel();
-            Session["SelectedSubMenu"] = "ProblemClass";
-            var problemClasses = am.ProblemClassGetAll();
+    public ActionResult ProblemClass() {
+      AdministrationServiceClient adminCLient = Admin.GetClientFactory();
 
-            return View(problemClasses);
-        }//ProblemClass
+      AdminModel am = new AdminModel();
+      Session["SelectedSubMenu"] = "ProblemClass";
+      var problemClasses = am.ProblemClassGetAll();
 
-        public ActionResult Problem() {
-            AdministrationServiceClient adminCLient = Admin.GetClientFactory();
+      return View(problemClasses);
+    }//ProblemClass
 
-            AdminModel am = new AdminModel();
-            Session["SelectedSubMenu"] = "Problem";
-            var problem = am.ProblemsGetAll();
+    public ActionResult Problem() {
+      AdministrationServiceClient adminCLient = Admin.GetClientFactory();
 
-            return View(problem);
-        }//Problem
+      AdminModel am = new AdminModel();
+      Session["SelectedSubMenu"] = "Problem";
+      var problem = am.ProblemsGetAll();
 
-        public ActionResult OKBNamedItemList_Test() {
-            return View();
-        }//Problem
+      return View(problem);
+    }//Problem
 
-    }
+    public ActionResult OKBNamedItemList_Test() {
+      return View();
+    }//Problem
+
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmClassController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmClassController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmClassController.cs	(revision 6317)
@@ -7,98 +7,96 @@
 using HLWebOKBAdminPlugin.OKBAdministrationService;
 
-namespace HLWebOKBAdminPlugin.Controllers
-{
-    public class AlgorithmClassController : Controller
-    {
-        //
-        // GET: /AlgorithmClass/
+namespace HLWebOKBAdminPlugin.Controllers {
+  public class AlgorithmClassController : Controller {
+    //
+    // GET: /AlgorithmClass/
 
-        public ActionResult Index() {
+    public ActionResult Index() {
 
-            Session["SelectedSubMenu"] = "AlgorithmClass";
-            AlgorithmClassModel acm = new AlgorithmClassModel();
-            return View(acm);
-        }//Index
+      Session["SelectedSubMenu"] = "AlgorithmClass";
+      AlgorithmClassModel acm = new AlgorithmClassModel();
+      return View(acm);
+    }//Index
 
-        public ActionResult Detail(long? id) {
-            Session["SelectedSubMenu"] = "AlgorithmClass";
-            AlgorithmClassModel acm = new AlgorithmClassModel();
+    public ActionResult Detail(long? id) {
+      Session["SelectedSubMenu"] = "AlgorithmClass";
+      AlgorithmClassModel acm = new AlgorithmClassModel();
 
-            if (id == null)
-                acm.AlgorithmClass = new AlgorithmClass();
-            else
-                acm.AlgorithmClass = (AlgorithmClass)acm.AlgorithmClasses.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
-            return View(acm);
-        }//Detail
+      if (id == null)
+        acm.AlgorithmClass = new AlgorithmClass();
+      else
+        acm.AlgorithmClass = (AlgorithmClass)acm.AlgorithmClasses.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
+      return View(acm);
+    }//Detail
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult Delete(long? id) {
-            Session["SelectedSubMenu"] = "AlgorithmClass";
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult Delete(long? id) {
+      Session["SelectedSubMenu"] = "AlgorithmClass";
 
-            AlgorithmClassModel acm = new AlgorithmClassModel();
-            if (id != 0) {
-                acm.DeleteAlgorithmClass((long)id);
-            }
-            return View("Index", acm);
-        }//Delete
+      AlgorithmClassModel acm = new AlgorithmClassModel();
+      if (id != 0) {
+        acm.DeleteAlgorithmClass((long)id);
+      }
+      return View("Index", acm);
+    }//Delete
 
-        /// <summary>
-        /// Controller for Detail View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SaveChanges(FormCollection collection) {
-            long algorithmClassId = long.Parse(collection.Get("AlgorithmClassId"));
-            String algorithmClassName = collection.Get("AlgorithmClassName");
-            String algorithmClassDescription = collection.Get("AlgorithmClassDescription");
+    /// <summary>
+    /// Controller for Detail View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SaveChanges(FormCollection collection) {
+      long algorithmClassId = long.Parse(collection.Get("AlgorithmClassId"));
+      String algorithmClassName = collection.Get("AlgorithmClassName");
+      String algorithmClassDescription = collection.Get("AlgorithmClassDescription");
 
-            // Later, we will get the runs from the session ...
-            AlgorithmClassModel acm = new AlgorithmClassModel();
-            if (algorithmClassId != 0)
-                acm.AlgorithmClass = (AlgorithmClass)acm.AlgorithmClasses.Where(x => x.Id.Equals(algorithmClassId)).FirstOrDefault();
+      // Later, we will get the runs from the session ...
+      AlgorithmClassModel acm = new AlgorithmClassModel();
+      if (algorithmClassId != 0)
+        acm.AlgorithmClass = (AlgorithmClass)acm.AlgorithmClasses.Where(x => x.Id.Equals(algorithmClassId)).FirstOrDefault();
 
-            acm.AlgorithmClass.Name = algorithmClassName;
-            acm.AlgorithmClass.Description = algorithmClassDescription;
+      acm.AlgorithmClass.Name = algorithmClassName;
+      acm.AlgorithmClass.Description = algorithmClassDescription;
 
-            acm.SaveAlgorithmClass(acm.AlgorithmClass);
+      acm.SaveAlgorithmClass(acm.AlgorithmClass);
 
-            return View("Index", acm);
-        }//SaveChanges
+      return View("Index", acm);
+    }//SaveChanges
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortAsc() {
-            Session["SelectedSubMenu"] = "AlgorithmClass";
-            AlgorithmClassModel acm = new AlgorithmClassModel();
-            acm.AlgorithmClasses = acm.AlgorithmClasses.OrderBy(x => x.Name).ToList<AlgorithmClass>();
-            return View("Index", acm);
-        }
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortAsc() {
+      Session["SelectedSubMenu"] = "AlgorithmClass";
+      AlgorithmClassModel acm = new AlgorithmClassModel();
+      acm.AlgorithmClasses = acm.AlgorithmClasses.OrderBy(x => x.Name).ToList<AlgorithmClass>();
+      return View("Index", acm);
+    }
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortDesc() {
-            Session["SelectedSubMenu"] = "AlgorithmClass";
-            AlgorithmClassModel acm = new AlgorithmClassModel();
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortDesc() {
+      Session["SelectedSubMenu"] = "AlgorithmClass";
+      AlgorithmClassModel acm = new AlgorithmClassModel();
 
-            IOrderedEnumerable<AlgorithmClass> acmOrderedList = acm.AlgorithmClasses.OrderByDescending(x => x.Name);
-            IList<AlgorithmClass> acmList = new List<AlgorithmClass>();
-            foreach (var item in acmOrderedList) {
-                acmList.Add(item);
-            }
-            acm.AlgorithmClasses = acmList;
+      IOrderedEnumerable<AlgorithmClass> acmOrderedList = acm.AlgorithmClasses.OrderByDescending(x => x.Name);
+      IList<AlgorithmClass> acmList = new List<AlgorithmClass>();
+      foreach (var item in acmOrderedList) {
+        acmList.Add(item);
+      }
+      acm.AlgorithmClasses = acmList;
 
-            // this should be the right code
-            //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
-            return View("Index", acm);
-        }
+      // this should be the right code
+      //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
+      return View("Index", acm);
+    }
 
-    }
+  }
 }
 
-    
+
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmController.cs	(revision 6317)
@@ -8,138 +8,134 @@
 using System.IO;
 
-namespace HLWebOKBAdminPlugin.Controllers
-{
+namespace HLWebOKBAdminPlugin.Controllers {
+  /// <summary>
+  /// Controller for Algorithm Submenu
+  /// </summary>
+  public class AlgorithmController : Controller {
     /// <summary>
-    /// Controller for Algorithm Submenu
+    /// Controller for Index View
     /// </summary>
-	public class AlgorithmController : Controller
-	{
-		/// <summary>
-		/// Controller for Index View
-		/// </summary>
-		/// <returns></returns>
-		public ActionResult Index()
-        {
-            Session["SelectedSubMenu"] = "Algorithm";
-            AlgorithmModel pm = new AlgorithmModel();
-			return View(pm);
-		}
+    /// <returns></returns>
+    public ActionResult Index() {
+      Session["SelectedSubMenu"] = "Algorithm";
+      AlgorithmModel pm = new AlgorithmModel();
+      return View(pm);
+    }
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortAsc() {
-            Session["SelectedSubMenu"] = "Algorithm";
-            AlgorithmModel pm = new AlgorithmModel();
-            pm.Algorithms = pm.Algorithms.OrderBy(x => x.Name).ToList<Algorithm>();
-            return View("Index",pm);
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortAsc() {
+      Session["SelectedSubMenu"] = "Algorithm";
+      AlgorithmModel pm = new AlgorithmModel();
+      pm.Algorithms = pm.Algorithms.OrderBy(x => x.Name).ToList<Algorithm>();
+      return View("Index", pm);
+    }
+
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortDesc() {
+      Session["SelectedSubMenu"] = "Algorithm";
+      AlgorithmModel pm = new AlgorithmModel();
+      pm.Algorithms = pm.Algorithms.OrderByDescending(x => x.Name).ToArray<Algorithm>();
+      return View("Index", pm);
+    }
+    /// <summary>
+    /// Controller for Detail View
+    /// </summary>
+    /// <param name="p"></param>
+    /// <returns></returns>
+    public ActionResult Detail(long? id) {
+      Session["SelectedSubMenu"] = "Algorithm";
+      // We use here the AlgorithmMode, but I think
+      // we can also use the Algorithm class. (?)
+      AlgorithmModel pm = new AlgorithmModel();
+      if (id == null)
+        pm.Algorithm = new Algorithm();
+      else
+        pm.Algorithm = (Algorithm)pm.Algorithms.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
+      return View(pm);
+    }
+
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult Delete(long id) {
+      Session["SelectedSubMenu"] = "Algorithm";
+      // We use here the AlgorithmMode, but I think
+      // we can also use the Algorithm class. (?)
+      AlgorithmModel pm = new AlgorithmModel();
+      if (id != 0) {
+        pm.DeleteAlgorithm(id);
+      }
+      return View("Index", pm);
+    }
+
+    public ActionResult UploadFile(FormCollection collection) {
+      Session["SelectedSubMenu"] = "Algorithm";
+
+      long algorithmId = long.Parse(collection.Get("AlgorithmId"));
+
+      AlgorithmModel pm = new AlgorithmModel();
+
+      foreach (string inputTagName in Request.Files) {
+        HttpPostedFileBase file = Request.Files[inputTagName];
+        if (file.ContentLength > 0) {
+          // maybe for storage on server
+          //string filePath = Path.Combine(HttpContext.Server.MapPath("../Uploads"), Path.GetFileName(file.FileName));
+          if (file.InputStream.CanRead) {
+            //file length
+            int fileLength = file.ContentLength;
+
+            //bytearray
+            byte[] data = new byte[fileLength];
+
+            //initialize input stream
+            Stream dataStream = file.InputStream;
+
+            //read file into byte array
+            dataStream.Read(data, 0, fileLength);
+
+            //save data
+            pm.UpdateAlgorithmData(algorithmId, data);
+          }//if
         }
+      }//foreach
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortDesc() {
-            Session["SelectedSubMenu"] = "Algorithm";
-            AlgorithmModel pm = new AlgorithmModel();
-            pm.Algorithms = pm.Algorithms.OrderByDescending(x => x.Name).ToArray<Algorithm>();
-            return View("Index",pm);
-        }
-        /// <summary>
-        /// Controller for Detail View
-        /// </summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-		public ActionResult Detail(long? id)
-        {
-            Session["SelectedSubMenu"] = "Algorithm";
-            // We use here the AlgorithmMode, but I think
-            // we can also use the Algorithm class. (?)
-            AlgorithmModel pm = new AlgorithmModel();
-            if(id == null)
-                pm.Algorithm = new Algorithm();
-            else
-                pm.Algorithm = (Algorithm)pm.Algorithms.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
-			return View(pm);
-		}
+      return View("Index", pm);
+    }//UploadFile
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult Delete(long id) {
-            Session["SelectedSubMenu"] = "Algorithm";
-            // We use here the AlgorithmMode, but I think
-            // we can also use the Algorithm class. (?)
-            AlgorithmModel pm = new AlgorithmModel();
-            if(id != 0) {
-                pm.DeleteAlgorithm(id);
-            }
-            return View("Index", pm);
-        }
+    /// <summary>
+    /// Controller for Detail View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SaveChanges(FormCollection collection) {
+      long algorithmId = long.Parse(collection.Get("AlgorithmId"));
+      String algorithmName = collection.Get("AlgorithmName");
+      String algorithmDescription = collection.Get("AlgorithmDescription");
+      String algorithmDataTypeName = collection.Get("AlgorithmDataTypeName");
+      long algorithmClassId = long.Parse(collection.Get("AlgorithmClassId"));
+      long platformId = long.Parse(collection.Get("PlatformId"));
 
-        public ActionResult UploadFile(FormCollection collection) {
-            Session["SelectedSubMenu"] = "Algorithm";
+      // Later, we will get the runs from the session ...
+      AlgorithmModel pm = new AlgorithmModel();
+      if (algorithmId != 0)
+        pm.Algorithm = (Algorithm)pm.Algorithms.Where(x => x.Id.Equals(algorithmId)).FirstOrDefault();
 
-            long algorithmId = long.Parse(collection.Get("AlgorithmId"));
+      pm.Algorithm.Name = algorithmName;
+      pm.Algorithm.Description = algorithmDescription;
+      pm.Algorithm.DataTypeName = algorithmDataTypeName;
+      pm.Algorithm.DataTypeTypeName = "";
+      pm.Algorithm.AlgorithmClassId = algorithmClassId;
+      pm.Algorithm.PlatformId = platformId;
 
-            AlgorithmModel pm = new AlgorithmModel();
+      pm.SaveAlgorithm(pm.Algorithm);
 
-            foreach (string inputTagName in Request.Files) {
-                HttpPostedFileBase file = Request.Files[inputTagName];
-                if (file.ContentLength > 0) {
-                    // maybe for storage on server
-                    //string filePath = Path.Combine(HttpContext.Server.MapPath("../Uploads"), Path.GetFileName(file.FileName));
-                    if (file.InputStream.CanRead) {
-                        //file length
-                        int fileLength = file.ContentLength;
-
-                        //bytearray
-                        byte[] data = new byte[fileLength];
-
-                        //initialize input stream
-                        Stream dataStream = file.InputStream;
-
-                        //read file into byte array
-                        dataStream.Read(data, 0, fileLength);
-
-                        //save data
-                        pm.UpdateAlgorithmData(algorithmId, data);
-                    }//if
-                }
-            }//foreach
-
-            return View("Index", pm);
-        }//UploadFile
-
-        /// <summary>
-        /// Controller for Detail View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SaveChanges(FormCollection collection) {            
-            long algorithmId = long.Parse(collection.Get("AlgorithmId"));
-            String algorithmName = collection.Get("AlgorithmName");
-            String algorithmDescription = collection.Get("AlgorithmDescription");
-            String algorithmDataTypeName = collection.Get("AlgorithmDataTypeName");
-            long algorithmClassId = long.Parse(collection.Get("AlgorithmClassId"));
-            long platformId = long.Parse(collection.Get("PlatformId"));
-
-            // Later, we will get the runs from the session ...
-            AlgorithmModel pm = new AlgorithmModel();
-            if(algorithmId != 0)
-                pm.Algorithm = (Algorithm)pm.Algorithms.Where(x => x.Id.Equals(algorithmId)).FirstOrDefault();
-
-            pm.Algorithm.Name = algorithmName;
-            pm.Algorithm.Description = algorithmDescription;
-            pm.Algorithm.DataTypeName = algorithmDataTypeName;
-            pm.Algorithm.DataTypeTypeName = "";
-            pm.Algorithm.AlgorithmClassId = algorithmClassId;
-            pm.Algorithm.PlatformId = platformId;
-
-            pm.SaveAlgorithm(pm.Algorithm);
-
-            return View("Index",pm);
-        }
-	}
+      return View("Index", pm);
+    }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/HomeController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/HomeController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/HomeController.cs	(revision 6317)
@@ -5,22 +5,19 @@
 using System.Web.Mvc;
 
-namespace HLWebOKBAdminPlugin.Controllers
-{
-    [HandleError]
-    public class HomeController : Controller
-    {
-        //
-        // GET: /Home/
+namespace HLWebOKBAdminPlugin.Controllers {
+  [HandleError]
+  public class HomeController : Controller {
+    //
+    // GET: /Home/
 
-        public ActionResult Index()
-        {
-            ViewData["Message"] = "Welcome to ASP.NET MVC!";
-            return View();
-        }
+    public ActionResult Index() {
+      ViewData["Message"] = "Welcome to ASP.NET MVC!";
+      return View();
+    }
 
-        public ActionResult About() {
-            return View();
-        }
+    public ActionResult About() {
+      return View();
+    }
 
-    }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/PlatformController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/PlatformController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/PlatformController.cs	(revision 6317)
@@ -7,84 +7,81 @@
 using HLWebOKBAdminPlugin.OKBAdministrationService;
 
-namespace HLWebOKBAdminPlugin.Controllers
-{
-    public class PlatformController : Controller
-    {
-        //
-        // GET: /Platform/
+namespace HLWebOKBAdminPlugin.Controllers {
+  public class PlatformController : Controller {
+    //
+    // GET: /Platform/
 
-        public ActionResult Index() 
-        {
-            Session["SelectedSubMenu"] = "Platform";
-            PlatformModel plm = new PlatformModel();
-            return View(plm);
-        }//Index
+    public ActionResult Index() {
+      Session["SelectedSubMenu"] = "Platform";
+      PlatformModel plm = new PlatformModel();
+      return View(plm);
+    }//Index
 
 
-        public ActionResult Detail(long? id) {
-            Session["SelectedSubMenu"] = "Platform";
-            PlatformModel plm = new PlatformModel();
+    public ActionResult Detail(long? id) {
+      Session["SelectedSubMenu"] = "Platform";
+      PlatformModel plm = new PlatformModel();
 
-            if (id == null)
-                plm.Platform = new Platform();
-            else
-                plm.Platform = (Platform)plm.Platforms.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
-            return View(plm);
-        }//Detail
+      if (id == null)
+        plm.Platform = new Platform();
+      else
+        plm.Platform = (Platform)plm.Platforms.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
+      return View(plm);
+    }//Detail
 
-        public ActionResult Delete(long? id) {
-            Session["SelectedSubMenu"] = "Platform";
+    public ActionResult Delete(long? id) {
+      Session["SelectedSubMenu"] = "Platform";
 
-            PlatformModel plm = new PlatformModel();
-            if (id != 0) {
-                plm.DeletePlatform((long)id);
-            }
-            return View("Index", plm);
-        }//Delete
+      PlatformModel plm = new PlatformModel();
+      if (id != 0) {
+        plm.DeletePlatform((long)id);
+      }
+      return View("Index", plm);
+    }//Delete
 
-        public ActionResult SaveChanges(FormCollection collection) {
-            long platformId = long.Parse(collection.Get("PlatformId"));
-            String platformName = collection.Get("PlatformName");
-            String platformDescription = collection.Get("PlatformDescription");
+    public ActionResult SaveChanges(FormCollection collection) {
+      long platformId = long.Parse(collection.Get("PlatformId"));
+      String platformName = collection.Get("PlatformName");
+      String platformDescription = collection.Get("PlatformDescription");
 
-            // Later, we will get the runs from the session ...
-            PlatformModel plm = new PlatformModel();
-            if (platformId != 0)
-                plm.Platform = (Platform)plm.Platforms.Where(x => x.Id.Equals(platformId)).FirstOrDefault();
+      // Later, we will get the runs from the session ...
+      PlatformModel plm = new PlatformModel();
+      if (platformId != 0)
+        plm.Platform = (Platform)plm.Platforms.Where(x => x.Id.Equals(platformId)).FirstOrDefault();
 
-            plm.Platform.Name = platformName;
-            plm.Platform.Description = platformDescription;
+      plm.Platform.Name = platformName;
+      plm.Platform.Description = platformDescription;
 
-            plm.SavePlatform(plm.Platform);
+      plm.SavePlatform(plm.Platform);
 
-            return View("Index", plm);
-        }//SaveChanges
+      return View("Index", plm);
+    }//SaveChanges
 
-        public ActionResult SortAsc() {
-            Session["SelectedSubMenu"] = "Platform";
-            PlatformModel plm = new PlatformModel();
-            plm.Platforms = plm.Platforms.OrderBy(x => x.Name).ToList<Platform>();
-            return View("Index", plm);
-        }
+    public ActionResult SortAsc() {
+      Session["SelectedSubMenu"] = "Platform";
+      PlatformModel plm = new PlatformModel();
+      plm.Platforms = plm.Platforms.OrderBy(x => x.Name).ToList<Platform>();
+      return View("Index", plm);
+    }
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortDesc() {
-            Session["SelectedSubMenu"] = "Platform";
-            PlatformModel plm = new PlatformModel();
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortDesc() {
+      Session["SelectedSubMenu"] = "Platform";
+      PlatformModel plm = new PlatformModel();
 
-            IOrderedEnumerable<Platform> plmOrderedList = plm.Platforms.OrderByDescending(x => x.Name);
-            IList<Platform> plmList = new List<Platform>();
-            foreach (var item in plmOrderedList) {
-                plmList.Add(item);
-            }
-            plm.Platforms = plmList;
+      IOrderedEnumerable<Platform> plmOrderedList = plm.Platforms.OrderByDescending(x => x.Name);
+      IList<Platform> plmList = new List<Platform>();
+      foreach (var item in plmOrderedList) {
+        plmList.Add(item);
+      }
+      plm.Platforms = plmList;
 
-            // this should be the right code
-            //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
-            return View("Index", plm);
-        }
+      // this should be the right code
+      //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
+      return View("Index", plm);
     }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemClassController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemClassController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemClassController.cs	(revision 6317)
@@ -8,99 +8,96 @@
 
 
-namespace HLWebOKBAdminPlugin.Controllers
-{
-    // <summary>
-    // Controller for ProblemClass Submenu
-    // </summary>
-    public class ProblemClassController : Controller
-    {
-        //
-        // GET: /ProblemClass/
+namespace HLWebOKBAdminPlugin.Controllers {
+  // <summary>
+  // Controller for ProblemClass Submenu
+  // </summary>
+  public class ProblemClassController : Controller {
+    //
+    // GET: /ProblemClass/
 
-        public ActionResult Index()
-        {
-            Session["SelectedSubMenu"] = "ProblemClass";
-            ProblemClassModel pcm = new ProblemClassModel();
-            return View(pcm);
-        }//Index
+    public ActionResult Index() {
+      Session["SelectedSubMenu"] = "ProblemClass";
+      ProblemClassModel pcm = new ProblemClassModel();
+      return View(pcm);
+    }//Index
 
-        public ActionResult Detail(long? id) {
-            Session["SelectedSubMenu"] = "ProblemClass";
-            ProblemClassModel pcm = new ProblemClassModel();
+    public ActionResult Detail(long? id) {
+      Session["SelectedSubMenu"] = "ProblemClass";
+      ProblemClassModel pcm = new ProblemClassModel();
 
-            if (id == null)
-                pcm.ProblemClass = new ProblemClass();
-            else
-                pcm.ProblemClass = (ProblemClass)pcm.ProblemClasses.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
-            return View(pcm);
-        }//Detail
+      if (id == null)
+        pcm.ProblemClass = new ProblemClass();
+      else
+        pcm.ProblemClass = (ProblemClass)pcm.ProblemClasses.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
+      return View(pcm);
+    }//Detail
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult Delete(long? id) {
-            Session["SelectedSubMenu"] = "ProblemClass";
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult Delete(long? id) {
+      Session["SelectedSubMenu"] = "ProblemClass";
 
-            ProblemClassModel pcm = new ProblemClassModel();
-            if (id != 0) {
-                pcm.DeleteProblemClass((long)id);
-            }
-            return View("Index", pcm);
-        }//Delete
+      ProblemClassModel pcm = new ProblemClassModel();
+      if (id != 0) {
+        pcm.DeleteProblemClass((long)id);
+      }
+      return View("Index", pcm);
+    }//Delete
 
-        /// <summary>
-        /// Controller for Detail View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SaveChanges(FormCollection collection) {
-            long problemClassId = long.Parse(collection.Get("ProblemClassId"));
-            String problemClassName = collection.Get("ProblemClassName");
-            String problemClassDescription = collection.Get("ProblemClassDescription");
+    /// <summary>
+    /// Controller for Detail View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SaveChanges(FormCollection collection) {
+      long problemClassId = long.Parse(collection.Get("ProblemClassId"));
+      String problemClassName = collection.Get("ProblemClassName");
+      String problemClassDescription = collection.Get("ProblemClassDescription");
 
-            // Later, we will get the runs from the session ...
-            ProblemClassModel pcm = new ProblemClassModel();
-            if (problemClassId != 0)
-                pcm.ProblemClass = (ProblemClass)pcm.ProblemClasses.Where(x => x.Id.Equals(problemClassId)).FirstOrDefault();
+      // Later, we will get the runs from the session ...
+      ProblemClassModel pcm = new ProblemClassModel();
+      if (problemClassId != 0)
+        pcm.ProblemClass = (ProblemClass)pcm.ProblemClasses.Where(x => x.Id.Equals(problemClassId)).FirstOrDefault();
 
-            pcm.ProblemClass.Name = problemClassName;
-            pcm.ProblemClass.Description = problemClassDescription;
+      pcm.ProblemClass.Name = problemClassName;
+      pcm.ProblemClass.Description = problemClassDescription;
 
-            pcm.SaveProblemClass(pcm.ProblemClass);
+      pcm.SaveProblemClass(pcm.ProblemClass);
 
-            return View("Index", pcm);
-        }//SaveChanges
+      return View("Index", pcm);
+    }//SaveChanges
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortAsc() {
-            Session["SelectedSubMenu"] = "ProblemClass";
-            ProblemClassModel pcm = new ProblemClassModel();
-            pcm.ProblemClasses = pcm.ProblemClasses.OrderBy(x => x.Name).ToList<ProblemClass>();
-            return View("Index", pcm);
-        }
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortAsc() {
+      Session["SelectedSubMenu"] = "ProblemClass";
+      ProblemClassModel pcm = new ProblemClassModel();
+      pcm.ProblemClasses = pcm.ProblemClasses.OrderBy(x => x.Name).ToList<ProblemClass>();
+      return View("Index", pcm);
+    }
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortDesc() {
-            Session["SelectedSubMenu"] = "ProblemClass";
-            ProblemClassModel pcm = new ProblemClassModel();
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortDesc() {
+      Session["SelectedSubMenu"] = "ProblemClass";
+      ProblemClassModel pcm = new ProblemClassModel();
 
-            IOrderedEnumerable<ProblemClass> pcmOrderedList = pcm.ProblemClasses.OrderByDescending(x => x.Name);
-            IList<ProblemClass> pcmList = new List<ProblemClass>();
-            foreach (var item in pcmOrderedList) {
-                pcmList.Add(item);
-            }
-            pcm.ProblemClasses = pcmList;
+      IOrderedEnumerable<ProblemClass> pcmOrderedList = pcm.ProblemClasses.OrderByDescending(x => x.Name);
+      IList<ProblemClass> pcmList = new List<ProblemClass>();
+      foreach (var item in pcmOrderedList) {
+        pcmList.Add(item);
+      }
+      pcm.ProblemClasses = pcmList;
 
-            // this should be the right code
-            //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
-            return View("Index", pcm);
-        }
+      // this should be the right code
+      //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
+      return View("Index", pcm);
+    }
 
-    }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemController.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemController.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemController.cs	(revision 6317)
@@ -8,148 +8,144 @@
 using System.IO;
 
-namespace HLWebOKBAdminPlugin.Controllers
-{
+namespace HLWebOKBAdminPlugin.Controllers {
+  /// <summary>
+  /// Controller for Problem Submenu
+  /// </summary>
+  public class ProblemController : Controller {
     /// <summary>
-    /// Controller for Problem Submenu
+    /// Controller for Index View
     /// </summary>
-	public class ProblemController : Controller
-	{
-		/// <summary>
-		/// Controller for Index View
-		/// </summary>
-		/// <returns></returns>
-		public ActionResult Index()
-        {
-            Session["SelectedSubMenu"] = "Problem";
-            ProblemModel pm = new ProblemModel();
-			return View(pm);
-		}
+    /// <returns></returns>
+    public ActionResult Index() {
+      Session["SelectedSubMenu"] = "Problem";
+      ProblemModel pm = new ProblemModel();
+      return View(pm);
+    }
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortAsc() {
-            Session["SelectedSubMenu"] = "Problem";
-            ProblemModel pm = new ProblemModel();
-            pm.Problems = pm.Problems.OrderBy(x => x.Name).ToList<Problem>();
-            return View("Index",pm);
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortAsc() {
+      Session["SelectedSubMenu"] = "Problem";
+      ProblemModel pm = new ProblemModel();
+      pm.Problems = pm.Problems.OrderBy(x => x.Name).ToList<Problem>();
+      return View("Index", pm);
+    }
+
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SortDesc() {
+      Session["SelectedSubMenu"] = "Problem";
+      ProblemModel pm = new ProblemModel();
+
+      //this is code for testing sortorder
+      IOrderedEnumerable<Problem> test = pm.Problems.OrderByDescending(x => x.Name);
+      IList<Problem> test2 = new List<Problem>();
+      foreach (var item in test) {
+        test2.Add(item);
+      }
+      pm.Problems = test2;
+
+      // this should be the right code
+      //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
+      return View("Index", pm);
+    }
+    /// <summary>
+    /// Controller for Detail View
+    /// </summary>
+    /// <param name="p"></param>
+    /// <returns></returns>
+    public ActionResult Detail(long? id) {
+      Session["SelectedSubMenu"] = "Problem";
+      // We use here the ProblemMode, but I think
+      // we can also use the Problem class. (?)
+      ProblemModel pm = new ProblemModel();
+      if (id == null)
+        pm.Problem = new Problem();
+      else
+        pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
+      return View(pm);
+    }
+
+    /// <summary>
+    /// Controller for Index View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult Delete(long id) {
+      Session["SelectedSubMenu"] = "Problem";
+      // We use here the ProblemMode, but I think
+      // we can also use the Problem class. (?)
+      ProblemModel pm = new ProblemModel();
+      if (id != 0) {
+        pm.DeleteProblem(id);
+      }
+      return View("Index", pm);
+    }
+
+    public ActionResult UploadFile(FormCollection collection) {
+      Session["SelectedSubMenu"] = "Problem";
+
+      long problemId = long.Parse(collection.Get("ProblemId"));
+
+      ProblemModel pm = new ProblemModel();
+
+      foreach (string inputTagName in Request.Files) {
+        HttpPostedFileBase file = Request.Files[inputTagName];
+        if (file.ContentLength > 0) {
+          // maybe for storage on server
+          //string filePath = Path.Combine(HttpContext.Server.MapPath("../Uploads"), Path.GetFileName(file.FileName));
+          if (file.InputStream.CanRead) {
+            //file length
+            int fileLength = file.ContentLength;
+
+            //bytearray
+            byte[] data = new byte[fileLength];
+
+            //initialize input stream
+            Stream dataStream = file.InputStream;
+
+            //read file into byte array
+            dataStream.Read(data, 0, fileLength);
+
+            //save data
+            pm.UpdateProblemData(problemId, data);
+          }//if
         }
+      }//foreach
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SortDesc() {
-            Session["SelectedSubMenu"] = "Problem";
-            ProblemModel pm = new ProblemModel();
+      return View("Index", pm);
+    }//UploadFile
 
-            //this is code for testing sortorder
-            IOrderedEnumerable<Problem> test = pm.Problems.OrderByDescending(x => x.Name);
-            IList<Problem> test2 = new List<Problem>();
-            foreach(var item in test) {
-                test2.Add(item);
-            }
-            pm.Problems = test2;
+    /// <summary>
+    /// Controller for Detail View
+    /// </summary>
+    /// <returns></returns>
+    public ActionResult SaveChanges(FormCollection collection) {
+      long problemId = long.Parse(collection.Get("ProblemId"));
+      String problemName = collection.Get("ProblemName");
+      String problemDescription = collection.Get("ProblemDescription");
+      String problemDataTypeName = collection.Get("ProblemDataTypeName");
+      long problemClassId = long.Parse(collection.Get("ProblemClassId"));
+      long platformId = long.Parse(collection.Get("PlatformId"));
 
-            // this should be the right code
-            //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
-            return View("Index", pm);
-        }
-        /// <summary>
-        /// Controller for Detail View
-        /// </summary>
-        /// <param name="p"></param>
-        /// <returns></returns>
-		public ActionResult Detail(long? id)
-        {
-            Session["SelectedSubMenu"] = "Problem";
-            // We use here the ProblemMode, but I think
-            // we can also use the Problem class. (?)
-            ProblemModel pm = new ProblemModel();
-            if(id == null)
-                pm.Problem = new Problem();
-            else
-                pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
-			return View(pm);
-		}
+      // Later, we will get the runs from the session ...
+      ProblemModel pm = new ProblemModel();
+      if (problemId != 0)
+        pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals(problemId)).FirstOrDefault();
 
-        /// <summary>
-        /// Controller for Index View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult Delete(long id) {
-            Session["SelectedSubMenu"] = "Problem";
-            // We use here the ProblemMode, but I think
-            // we can also use the Problem class. (?)
-            ProblemModel pm = new ProblemModel();
-            if(id != 0) {
-                pm.DeleteProblem(id);
-            }
-            return View("Index", pm);
-        }
-        
-        public ActionResult UploadFile(FormCollection collection) {
-            Session["SelectedSubMenu"] = "Problem";
+      pm.Problem.Name = problemName;
+      pm.Problem.Description = problemDescription;
+      pm.Problem.DataTypeName = problemDataTypeName;
+      pm.Problem.DataTypeTypeName = "";
+      pm.Problem.ProblemClassId = problemClassId;
+      pm.Problem.PlatformId = platformId;
 
-            long problemId = long.Parse(collection.Get("ProblemId"));           
+      pm.SaveProblem(pm.Problem);
 
-            ProblemModel pm = new ProblemModel();
-
-            foreach (string inputTagName in Request.Files) {
-                HttpPostedFileBase file = Request.Files[inputTagName];
-                if (file.ContentLength > 0) {
-                    // maybe for storage on server
-                    //string filePath = Path.Combine(HttpContext.Server.MapPath("../Uploads"), Path.GetFileName(file.FileName));
-                    if (file.InputStream.CanRead) {
-                        //file length
-                        int fileLength = file.ContentLength;
-
-                        //bytearray
-                        byte[] data = new byte[fileLength];
-
-                        //initialize input stream
-                        Stream dataStream = file.InputStream;
-
-                        //read file into byte array
-                        dataStream.Read(data, 0, fileLength);
-
-                        //save data
-                        pm.UpdateProblemData(problemId, data);
-                    }//if
-                }
-            }//foreach
-
-            return View("Index", pm);
-        }//UploadFile
-
-        /// <summary>
-        /// Controller for Detail View
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult SaveChanges(FormCollection collection) {            
-            long problemId = long.Parse(collection.Get("ProblemId"));
-            String problemName = collection.Get("ProblemName");
-            String problemDescription = collection.Get("ProblemDescription");
-            String problemDataTypeName = collection.Get("ProblemDataTypeName");
-            long problemClassId = long.Parse(collection.Get("ProblemClassId"));
-            long platformId = long.Parse(collection.Get("PlatformId"));
-
-            // Later, we will get the runs from the session ...
-            ProblemModel pm = new ProblemModel();
-            if(problemId != 0)
-                pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals(problemId)).FirstOrDefault();
-
-            pm.Problem.Name = problemName;
-            pm.Problem.Description = problemDescription;
-            pm.Problem.DataTypeName = problemDataTypeName;
-            pm.Problem.DataTypeTypeName = "";
-            pm.Problem.ProblemClassId = problemClassId;
-            pm.Problem.PlatformId = platformId;
-
-            pm.SaveProblem(pm.Problem);
-
-            return View("Index",pm);
-        }
-	}
+      return View("Index", pm);
+    }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Global.asax.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Global.asax.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Global.asax.cs	(revision 6317)
@@ -7,24 +7,24 @@
 
 namespace HLWebServiceTestPlugin {
-    // Note: For instructions on enabling IIS6 or IIS7 classic mode, 
-    // visit http://go.microsoft.com/?LinkId=9394801
+  // Note: For instructions on enabling IIS6 or IIS7 classic mode, 
+  // visit http://go.microsoft.com/?LinkId=9394801
 
-    public class MvcApplication : System.Web.HttpApplication {
-        public static void RegisterRoutes(RouteCollection routes) {
-            routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
+  public class MvcApplication : System.Web.HttpApplication {
+    public static void RegisterRoutes(RouteCollection routes) {
+      routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
 
-            routes.MapRoute(
-                "Default", // Route name
-                "{controller}/{action}/{id}", // URL with parameters
-                new { controller = "Home", action = "Index", id = UrlParameter.Optional } // Parameter defaults
-            );
+      routes.MapRoute(
+          "Default", // Route name
+          "{controller}/{action}/{id}", // URL with parameters
+          new { controller = "Home", action = "Index", id = UrlParameter.Optional } // Parameter defaults
+      );
 
-        }
+    }
 
-        protected void Application_Start() {
-            AreaRegistration.RegisterAllAreas();
+    protected void Application_Start() {
+      AreaRegistration.RegisterAllAreas();
 
-            RegisterRoutes(RouteTable.Routes);
-        }
+      RegisterRoutes(RouteTable.Routes);
     }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Helpers/Admin.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Helpers/Admin.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Helpers/Admin.cs	(revision 6317)
@@ -7,32 +7,32 @@
 
 namespace HLWebOKBAdminPlugin.Helpers {
-    public class Admin {
+  public class Admin {
 
-        public static AdministrationServiceClient GetClientFactory() {
-            return GetClientFactory(GetSessionString("Username"), GetSessionString("Password"));
+    public static AdministrationServiceClient GetClientFactory() {
+      return GetClientFactory(GetSessionString("Username"), GetSessionString("Password"));
+    }
+
+    public static AdministrationServiceClient GetClientFactory(string username, string password) {
+      try {
+        AdministrationServiceClient adminClient = new AdministrationServiceClient();
+        adminClient.ClientCredentials.UserName.UserName = username;
+        adminClient.ClientCredentials.UserName.Password = password;
+        adminClient.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+        return adminClient;
+      }
+      catch {
+      }
+      return null;
+    }
+
+    public static string GetSessionString(string name) {
+      if (name != null) {
+        object o = HttpContext.Current.Session[name];
+        if (o != null) {
+          return o.ToString();
         }
-
-        public static AdministrationServiceClient GetClientFactory(string username, string password) {
-            try {
-                AdministrationServiceClient adminClient = new AdministrationServiceClient();
-                adminClient.ClientCredentials.UserName.UserName = username;
-                adminClient.ClientCredentials.UserName.Password = password;
-                adminClient.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
-                return adminClient;
-            }
-            catch {
-            }
-            return null;
-        }
-
-        public static string GetSessionString(string name) {
-            if (name != null) {
-                object o = HttpContext.Current.Session[name];
-                if (o != null) {
-                    return o.ToString();
-                }
-            }
-            return string.Empty;
-        }
+      }
+      return string.Empty;
     }
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Helpers/HtmlHelpers.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Helpers/HtmlHelpers.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Helpers/HtmlHelpers.cs	(revision 6317)
@@ -6,20 +6,20 @@
 
 namespace HLWebOKBAdminPlugin.Helpers {
-    public static class HtmlHelpers {
+  public static class HtmlHelpers {
 
-        public static string Truncate(this HtmlHelper helper, string input, int length) {
-            //takes a string and adds "..." if length > max length 
-            
-            if (input == null)
-                return "";
+    public static string Truncate(this HtmlHelper helper, string input, int length) {
+      //takes a string and adds "..." if length > max length 
 
-            if (input.Length <= length) {
-                return input;
-            }//if
-            else {
-                return input.Substring(0, length) + "...";
-            }//else
-        }//Truncate
+      if (input == null)
+        return "";
 
-    }//HtmlHelpers
+      if (input.Length <= length) {
+        return input;
+      }//if
+      else {
+        return input.Substring(0, length) + "...";
+      }//else
+    }//Truncate
+
+  }//HtmlHelpers
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AccountModels.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AccountModels.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AccountModels.cs	(revision 6317)
@@ -11,240 +11,240 @@
 namespace HLWebServiceTestPlugin.Models {
 
-    #region Models
-    [PropertiesMustMatch("NewPassword", "ConfirmPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-    public class ChangePasswordModel {
-        [Required]
-        [DataType(DataType.Password)]
-        [DisplayName("Current password")]
-        public string OldPassword { get; set; }
-
-        [Required]
-        [ValidatePasswordLength]
-        [DataType(DataType.Password)]
-        [DisplayName("New password")]
-        public string NewPassword { get; set; }
-
-        [Required]
-        [DataType(DataType.Password)]
-        [DisplayName("Confirm new password")]
-        public string ConfirmPassword { get; set; }
-    }
-
-    public class LogOnModel {
-        [Required]
-        [DisplayName("User name")]
-        public string UserName { get; set; }
-
-        [Required]
-        [DataType(DataType.Password)]
-        [DisplayName("Password")]
-        public string Password { get; set; }
-
-        [DisplayName("Remember me?")]
-        public bool RememberMe { get; set; }
-    }
-
-    [PropertiesMustMatch("Password", "ConfirmPassword", ErrorMessage = "The password and confirmation password do not match.")]
-    public class RegisterModel {
-        [Required]
-        [DisplayName("User name")]
-        public string UserName { get; set; }
-
-        [Required]
-        [DataType(DataType.EmailAddress)]
-        [DisplayName("Email address")]
-        public string Email { get; set; }
-
-        [Required]
-        [ValidatePasswordLength]
-        [DataType(DataType.Password)]
-        [DisplayName("Password")]
-        public string Password { get; set; }
-
-        [Required]
-        [DataType(DataType.Password)]
-        [DisplayName("Confirm password")]
-        public string ConfirmPassword { get; set; }
-    }
-    #endregion
-
-    #region Services
-    // The FormsAuthentication type is sealed and contains static members, so it is difficult to
-    // unit test code that calls its members. The interface and helper class below demonstrate
-    // how to create an abstract wrapper around such a type in order to make the AccountController
-    // code unit testable.
-
-    public interface IMembershipService {
-        int MinPasswordLength { get; }
-
-        bool ValidateUser(string userName, string password);
-        MembershipCreateStatus CreateUser(string userName, string password, string email);
-        bool ChangePassword(string userName, string oldPassword, string newPassword);
-    }
-
-    public class AccountMembershipService : IMembershipService {
-        private readonly MembershipProvider _provider;
-
-        public AccountMembershipService()
-            : this(null) {
-        }
-
-        public AccountMembershipService(MembershipProvider provider) {
-            _provider = provider ?? Membership.Provider;
-        }
-
-        public int MinPasswordLength {
-            get {
-                return _provider.MinRequiredPasswordLength;
-            }
-        }
-
-        public bool ValidateUser(string userName, string password) {
-            if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
-            if (String.IsNullOrEmpty(password)) throw new ArgumentException("Value cannot be null or empty.", "password");
-
-            return _provider.ValidateUser(userName, password);
-        }
-
-        public MembershipCreateStatus CreateUser(string userName, string password, string email) {
-            if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
-            if (String.IsNullOrEmpty(password)) throw new ArgumentException("Value cannot be null or empty.", "password");
-            if (String.IsNullOrEmpty(email)) throw new ArgumentException("Value cannot be null or empty.", "email");
-
-            MembershipCreateStatus status;
-            _provider.CreateUser(userName, password, email, null, null, true, null, out status);
-            return status;
-        }
-
-        public bool ChangePassword(string userName, string oldPassword, string newPassword) {
-            if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
-            if (String.IsNullOrEmpty(oldPassword)) throw new ArgumentException("Value cannot be null or empty.", "oldPassword");
-            if (String.IsNullOrEmpty(newPassword)) throw new ArgumentException("Value cannot be null or empty.", "newPassword");
-
-            // The underlying ChangePassword() will throw an exception rather
-            // than return false in certain failure scenarios.
-            try {
-                MembershipUser currentUser = _provider.GetUser(userName, true /* userIsOnline */);
-                return currentUser.ChangePassword(oldPassword, newPassword);
-            }
-            catch (ArgumentException) {
-                return false;
-            }
-            catch (MembershipPasswordException) {
-                return false;
-            }
-        }
-    }
-
-    public interface IFormsAuthenticationService {
-        void SignIn(string userName, bool createPersistentCookie);
-        void SignOut();
-    }
-
-    public class FormsAuthenticationService : IFormsAuthenticationService {
-        public void SignIn(string userName, bool createPersistentCookie) {
-            if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
-
-            FormsAuthentication.SetAuthCookie(userName, createPersistentCookie);
-        }
-
-        public void SignOut() {
-            FormsAuthentication.SignOut();
-        }
-    }
-    #endregion
-
-    #region Validation
-    public static class AccountValidation {
-        public static string ErrorCodeToString(MembershipCreateStatus createStatus) {
-            // See http://go.microsoft.com/fwlink/?LinkID=177550 for
-            // a full list of status codes.
-            switch (createStatus) {
-                case MembershipCreateStatus.DuplicateUserName:
-                    return "Username already exists. Please enter a different user name.";
-
-                case MembershipCreateStatus.DuplicateEmail:
-                    return "A username for that e-mail address already exists. Please enter a different e-mail address.";
-
-                case MembershipCreateStatus.InvalidPassword:
-                    return "The password provided is invalid. Please enter a valid password value.";
-
-                case MembershipCreateStatus.InvalidEmail:
-                    return "The e-mail address provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.InvalidAnswer:
-                    return "The password retrieval answer provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.InvalidQuestion:
-                    return "The password retrieval question provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.InvalidUserName:
-                    return "The user name provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.ProviderError:
-                    return "The authentication provider returned an error. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
-
-                case MembershipCreateStatus.UserRejected:
-                    return "The user creation request has been canceled. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
-
-                default:
-                    return "An unknown error occurred. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
-            }
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-    public sealed class PropertiesMustMatchAttribute : ValidationAttribute {
-        private const string _defaultErrorMessage = "'{0}' and '{1}' do not match.";
-        private readonly object _typeId = new object();
-
-        public PropertiesMustMatchAttribute(string originalProperty, string confirmProperty)
-            : base(_defaultErrorMessage) {
-            OriginalProperty = originalProperty;
-            ConfirmProperty = confirmProperty;
-        }
-
-        public string ConfirmProperty { get; private set; }
-        public string OriginalProperty { get; private set; }
-
-        public override object TypeId {
-            get {
-                return _typeId;
-            }
-        }
-
-        public override string FormatErrorMessage(string name) {
-            return String.Format(CultureInfo.CurrentUICulture, ErrorMessageString,
-                OriginalProperty, ConfirmProperty);
-        }
-
-        public override bool IsValid(object value) {
-            PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(value);
-            object originalValue = properties.Find(OriginalProperty, true /* ignoreCase */).GetValue(value);
-            object confirmValue = properties.Find(ConfirmProperty, true /* ignoreCase */).GetValue(value);
-            return Object.Equals(originalValue, confirmValue);
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-    public sealed class ValidatePasswordLengthAttribute : ValidationAttribute {
-        private const string _defaultErrorMessage = "'{0}' must be at least {1} characters long.";
-        private readonly int _minCharacters = Membership.Provider.MinRequiredPasswordLength;
-
-        public ValidatePasswordLengthAttribute()
-            : base(_defaultErrorMessage) {
-        }
-
-        public override string FormatErrorMessage(string name) {
-            return String.Format(CultureInfo.CurrentUICulture, ErrorMessageString,
-                name, _minCharacters);
-        }
-
-        public override bool IsValid(object value) {
-            string valueAsString = value as string;
-            return (valueAsString != null && valueAsString.Length >= _minCharacters);
-        }
-    }
-    #endregion
+  #region Models
+  [PropertiesMustMatch("NewPassword", "ConfirmPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+  public class ChangePasswordModel {
+    [Required]
+    [DataType(DataType.Password)]
+    [DisplayName("Current password")]
+    public string OldPassword { get; set; }
+
+    [Required]
+    [ValidatePasswordLength]
+    [DataType(DataType.Password)]
+    [DisplayName("New password")]
+    public string NewPassword { get; set; }
+
+    [Required]
+    [DataType(DataType.Password)]
+    [DisplayName("Confirm new password")]
+    public string ConfirmPassword { get; set; }
+  }
+
+  public class LogOnModel {
+    [Required]
+    [DisplayName("User name")]
+    public string UserName { get; set; }
+
+    [Required]
+    [DataType(DataType.Password)]
+    [DisplayName("Password")]
+    public string Password { get; set; }
+
+    [DisplayName("Remember me?")]
+    public bool RememberMe { get; set; }
+  }
+
+  [PropertiesMustMatch("Password", "ConfirmPassword", ErrorMessage = "The password and confirmation password do not match.")]
+  public class RegisterModel {
+    [Required]
+    [DisplayName("User name")]
+    public string UserName { get; set; }
+
+    [Required]
+    [DataType(DataType.EmailAddress)]
+    [DisplayName("Email address")]
+    public string Email { get; set; }
+
+    [Required]
+    [ValidatePasswordLength]
+    [DataType(DataType.Password)]
+    [DisplayName("Password")]
+    public string Password { get; set; }
+
+    [Required]
+    [DataType(DataType.Password)]
+    [DisplayName("Confirm password")]
+    public string ConfirmPassword { get; set; }
+  }
+  #endregion
+
+  #region Services
+  // The FormsAuthentication type is sealed and contains static members, so it is difficult to
+  // unit test code that calls its members. The interface and helper class below demonstrate
+  // how to create an abstract wrapper around such a type in order to make the AccountController
+  // code unit testable.
+
+  public interface IMembershipService {
+    int MinPasswordLength { get; }
+
+    bool ValidateUser(string userName, string password);
+    MembershipCreateStatus CreateUser(string userName, string password, string email);
+    bool ChangePassword(string userName, string oldPassword, string newPassword);
+  }
+
+  public class AccountMembershipService : IMembershipService {
+    private readonly MembershipProvider _provider;
+
+    public AccountMembershipService()
+      : this(null) {
+    }
+
+    public AccountMembershipService(MembershipProvider provider) {
+      _provider = provider ?? Membership.Provider;
+    }
+
+    public int MinPasswordLength {
+      get {
+        return _provider.MinRequiredPasswordLength;
+      }
+    }
+
+    public bool ValidateUser(string userName, string password) {
+      if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
+      if (String.IsNullOrEmpty(password)) throw new ArgumentException("Value cannot be null or empty.", "password");
+
+      return _provider.ValidateUser(userName, password);
+    }
+
+    public MembershipCreateStatus CreateUser(string userName, string password, string email) {
+      if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
+      if (String.IsNullOrEmpty(password)) throw new ArgumentException("Value cannot be null or empty.", "password");
+      if (String.IsNullOrEmpty(email)) throw new ArgumentException("Value cannot be null or empty.", "email");
+
+      MembershipCreateStatus status;
+      _provider.CreateUser(userName, password, email, null, null, true, null, out status);
+      return status;
+    }
+
+    public bool ChangePassword(string userName, string oldPassword, string newPassword) {
+      if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
+      if (String.IsNullOrEmpty(oldPassword)) throw new ArgumentException("Value cannot be null or empty.", "oldPassword");
+      if (String.IsNullOrEmpty(newPassword)) throw new ArgumentException("Value cannot be null or empty.", "newPassword");
+
+      // The underlying ChangePassword() will throw an exception rather
+      // than return false in certain failure scenarios.
+      try {
+        MembershipUser currentUser = _provider.GetUser(userName, true /* userIsOnline */);
+        return currentUser.ChangePassword(oldPassword, newPassword);
+      }
+      catch (ArgumentException) {
+        return false;
+      }
+      catch (MembershipPasswordException) {
+        return false;
+      }
+    }
+  }
+
+  public interface IFormsAuthenticationService {
+    void SignIn(string userName, bool createPersistentCookie);
+    void SignOut();
+  }
+
+  public class FormsAuthenticationService : IFormsAuthenticationService {
+    public void SignIn(string userName, bool createPersistentCookie) {
+      if (String.IsNullOrEmpty(userName)) throw new ArgumentException("Value cannot be null or empty.", "userName");
+
+      FormsAuthentication.SetAuthCookie(userName, createPersistentCookie);
+    }
+
+    public void SignOut() {
+      FormsAuthentication.SignOut();
+    }
+  }
+  #endregion
+
+  #region Validation
+  public static class AccountValidation {
+    public static string ErrorCodeToString(MembershipCreateStatus createStatus) {
+      // See http://go.microsoft.com/fwlink/?LinkID=177550 for
+      // a full list of status codes.
+      switch (createStatus) {
+        case MembershipCreateStatus.DuplicateUserName:
+          return "Username already exists. Please enter a different user name.";
+
+        case MembershipCreateStatus.DuplicateEmail:
+          return "A username for that e-mail address already exists. Please enter a different e-mail address.";
+
+        case MembershipCreateStatus.InvalidPassword:
+          return "The password provided is invalid. Please enter a valid password value.";
+
+        case MembershipCreateStatus.InvalidEmail:
+          return "The e-mail address provided is invalid. Please check the value and try again.";
+
+        case MembershipCreateStatus.InvalidAnswer:
+          return "The password retrieval answer provided is invalid. Please check the value and try again.";
+
+        case MembershipCreateStatus.InvalidQuestion:
+          return "The password retrieval question provided is invalid. Please check the value and try again.";
+
+        case MembershipCreateStatus.InvalidUserName:
+          return "The user name provided is invalid. Please check the value and try again.";
+
+        case MembershipCreateStatus.ProviderError:
+          return "The authentication provider returned an error. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
+
+        case MembershipCreateStatus.UserRejected:
+          return "The user creation request has been canceled. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
+
+        default:
+          return "An unknown error occurred. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
+      }
+    }
+  }
+
+  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+  public sealed class PropertiesMustMatchAttribute : ValidationAttribute {
+    private const string _defaultErrorMessage = "'{0}' and '{1}' do not match.";
+    private readonly object _typeId = new object();
+
+    public PropertiesMustMatchAttribute(string originalProperty, string confirmProperty)
+      : base(_defaultErrorMessage) {
+      OriginalProperty = originalProperty;
+      ConfirmProperty = confirmProperty;
+    }
+
+    public string ConfirmProperty { get; private set; }
+    public string OriginalProperty { get; private set; }
+
+    public override object TypeId {
+      get {
+        return _typeId;
+      }
+    }
+
+    public override string FormatErrorMessage(string name) {
+      return String.Format(CultureInfo.CurrentUICulture, ErrorMessageString,
+          OriginalProperty, ConfirmProperty);
+    }
+
+    public override bool IsValid(object value) {
+      PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(value);
+      object originalValue = properties.Find(OriginalProperty, true /* ignoreCase */).GetValue(value);
+      object confirmValue = properties.Find(ConfirmProperty, true /* ignoreCase */).GetValue(value);
+      return Object.Equals(originalValue, confirmValue);
+    }
+  }
+
+  [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+  public sealed class ValidatePasswordLengthAttribute : ValidationAttribute {
+    private const string _defaultErrorMessage = "'{0}' must be at least {1} characters long.";
+    private readonly int _minCharacters = Membership.Provider.MinRequiredPasswordLength;
+
+    public ValidatePasswordLengthAttribute()
+      : base(_defaultErrorMessage) {
+    }
+
+    public override string FormatErrorMessage(string name) {
+      return String.Format(CultureInfo.CurrentUICulture, ErrorMessageString,
+          name, _minCharacters);
+    }
+
+    public override bool IsValid(object value) {
+      string valueAsString = value as string;
+      return (valueAsString != null && valueAsString.Length >= _minCharacters);
+    }
+  }
+  #endregion
 
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AdminModel.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AdminModel.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AdminModel.cs	(revision 6317)
@@ -7,231 +7,231 @@
 
 namespace HLWebOKBAdminPlugin.Models {
-    public class AdminModel {
-        //member var
-        private IList<AlgorithmClass> algorithmClassList;
-
-
-        public String SelectedSubMenu { get; set; }
-        public IList<AlgorithmClass> AlgorithmClassProp { get { return AlgorithmClassGetAll(); } set { ;} }
-
-
-        //***************************************Algorithm Class********************************************
-        //get all algorithm classes
-        private IList<AlgorithmClass> AlgorithmClassGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            algorithmClassList = new List<AlgorithmClass>();
-
-            if(adminClient != null) {
-                AlgorithmClass[] algorithmClasses = adminClient.GetAlgorithmClasses();
-                foreach(AlgorithmClass ac in algorithmClasses) {
-                    algorithmClassList.Add(ac);
-
-                }
-            }//if (adminClient != null)
-
-            return algorithmClassList;
-        }//AlgorithmClassGetAll
-
-        private long AddAlgorithmClass(AlgorithmClass algorithmClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                return adminClient.AddAlgorithmClass(algorithmClass);
-            }
-
-            return 0;
-        }//AddAlgorithmClass
-
-        public void DeleteAlgorithmClass(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                adminClient.DeleteAlgorithmClass(id);
-            }
-        }//DeleteAlgorithmClass
-
-        public long SaveAlgorithmClass(AlgorithmClass algorithmClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                if(algorithmClass.Id == 0) {
-                    return AddAlgorithmClass(algorithmClass);
-                } else {
-                    AlgorithmClass ac = adminClient.GetAlgorithmClass(algorithmClass.Id);
-
-                    if(ac != null) {
-                        adminClient.UpdateAlgorithmClass(algorithmClass);
-                        return algorithmClass.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveAlgorithmClass       
-
-        //***************************************Algorithms*************************************************
-        //get all algorithms
-        public IList<Algorithm> AlgorithmsGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            IList<Algorithm> algorithmList = new List<Algorithm>();
-
-            if(adminClient != null) {
-                Algorithm[] algorithm = adminClient.GetAlgorithms();
-                foreach(Algorithm al in algorithm) {
-                    algorithmList.Add(al);
-
-                }
-            }//if (adminClient != null)
-
-            return algorithmList;
-        }//AlgorithmsGetAll
-
-        private long AddAlgorithm(Algorithm algorithm) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                return adminClient.AddAlgorithm(algorithm);
-            }
-
-            return 0;
-        }//AddAlgorithm
-
-        public void DeleteAlgorithm(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                adminClient.DeleteAlgorithm(id);
-            }
-        }//DeleteAlgorithm
-
-        public long SaveAlgorithm(Algorithm algorithm) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                if(algorithm.Id == 0) {
-                    return AddAlgorithm(algorithm);
-                } else {
-                    Algorithm al = adminClient.GetAlgorithm(algorithm.Id);
-
-                    if(al != null) {
-                        adminClient.UpdateAlgorithm(algorithm);
-                        return algorithm.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveAlgorithm
-
-        //***************************************Problem Class**********************************************
-        public IList<ProblemClass> ProblemClassGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            IList<ProblemClass> problemClassList = new List<ProblemClass>();
-
-            if(adminClient != null) {
-                ProblemClass[] problemClasses = adminClient.GetProblemClasses();
-                foreach(ProblemClass pc in problemClasses) {
-                    problemClassList.Add(pc);
-                }
-            }//if (adminClient != null)
-
-            return problemClassList;
-        }//ProblemClassGetAll
-
-        private long AddProblemClass(ProblemClass problemClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                return adminClient.AddProblemClass(problemClass);
-            }
-
-            return 0;
-        }//AddProblemClass
-
-        public void DeleteProblemClass(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                adminClient.DeleteProblemClass(id);
-            }
-        }//DeleteProblemClass
-
-        public long SaveProblemClass(ProblemClass problemClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                if(problemClass.Id == 0) {
-                    return AddProblemClass(problemClass);
-                } else {
-                    ProblemClass pc = adminClient.GetProblemClass(problemClass.Id);
-
-                    if(pc != null) {
-                        adminClient.UpdateProblemClass(problemClass);
-                        return problemClass.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveProblemClass
-
-        //***************************************Problems***************************************************
-        public IList<Problem> ProblemsGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            IList<Problem> problemList = new List<Problem>();
-
-            if(adminClient != null) {
-                Problem[] problem = adminClient.GetProblems();
-                foreach(Problem pr in problem) {
-                    problemList.Add(pr);
-
-                }
-            }//if (adminClient != null)
-
-            return problemList;
-        }//ProblemsGetAll
-
-        private long AddProblem(Problem problem) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                return adminClient.AddProblem(problem);
-            }
-
-            return 0;
-        }//AddProblem
-
-        public void DeleteProblem(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                adminClient.DeleteProblem(id);
-            }
-        }//DeleteProblem
-
-        public long SaveProblem(Problem problem) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if(adminClient != null) {
-                if(problem.Id == 0) {
-                    return AddProblem(problem);
-                } else {
-                    Problem pr = adminClient.GetProblem(problem.Id);
-
-                    if(pr != null) {
-                        adminClient.UpdateProblem(problem);
-                        return problem.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveProblem
-
-        
-    }
+  public class AdminModel {
+    //member var
+    private IList<AlgorithmClass> algorithmClassList;
+
+
+    public String SelectedSubMenu { get; set; }
+    public IList<AlgorithmClass> AlgorithmClassProp { get { return AlgorithmClassGetAll(); } set { ;} }
+
+
+    //***************************************Algorithm Class********************************************
+    //get all algorithm classes
+    private IList<AlgorithmClass> AlgorithmClassGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      algorithmClassList = new List<AlgorithmClass>();
+
+      if (adminClient != null) {
+        AlgorithmClass[] algorithmClasses = adminClient.GetAlgorithmClasses();
+        foreach (AlgorithmClass ac in algorithmClasses) {
+          algorithmClassList.Add(ac);
+
+        }
+      }//if (adminClient != null)
+
+      return algorithmClassList;
+    }//AlgorithmClassGetAll
+
+    private long AddAlgorithmClass(AlgorithmClass algorithmClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        return adminClient.AddAlgorithmClass(algorithmClass);
+      }
+
+      return 0;
+    }//AddAlgorithmClass
+
+    public void DeleteAlgorithmClass(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        adminClient.DeleteAlgorithmClass(id);
+      }
+    }//DeleteAlgorithmClass
+
+    public long SaveAlgorithmClass(AlgorithmClass algorithmClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        if (algorithmClass.Id == 0) {
+          return AddAlgorithmClass(algorithmClass);
+        } else {
+          AlgorithmClass ac = adminClient.GetAlgorithmClass(algorithmClass.Id);
+
+          if (ac != null) {
+            adminClient.UpdateAlgorithmClass(algorithmClass);
+            return algorithmClass.Id;
+          }
+        }
+      }
+
+      return 0;
+    }//SaveAlgorithmClass       
+
+    //***************************************Algorithms*************************************************
+    //get all algorithms
+    public IList<Algorithm> AlgorithmsGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<Algorithm> algorithmList = new List<Algorithm>();
+
+      if (adminClient != null) {
+        Algorithm[] algorithm = adminClient.GetAlgorithms();
+        foreach (Algorithm al in algorithm) {
+          algorithmList.Add(al);
+
+        }
+      }//if (adminClient != null)
+
+      return algorithmList;
+    }//AlgorithmsGetAll
+
+    private long AddAlgorithm(Algorithm algorithm) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        return adminClient.AddAlgorithm(algorithm);
+      }
+
+      return 0;
+    }//AddAlgorithm
+
+    public void DeleteAlgorithm(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        adminClient.DeleteAlgorithm(id);
+      }
+    }//DeleteAlgorithm
+
+    public long SaveAlgorithm(Algorithm algorithm) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        if (algorithm.Id == 0) {
+          return AddAlgorithm(algorithm);
+        } else {
+          Algorithm al = adminClient.GetAlgorithm(algorithm.Id);
+
+          if (al != null) {
+            adminClient.UpdateAlgorithm(algorithm);
+            return algorithm.Id;
+          }
+        }
+      }
+
+      return 0;
+    }//SaveAlgorithm
+
+    //***************************************Problem Class**********************************************
+    public IList<ProblemClass> ProblemClassGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<ProblemClass> problemClassList = new List<ProblemClass>();
+
+      if (adminClient != null) {
+        ProblemClass[] problemClasses = adminClient.GetProblemClasses();
+        foreach (ProblemClass pc in problemClasses) {
+          problemClassList.Add(pc);
+        }
+      }//if (adminClient != null)
+
+      return problemClassList;
+    }//ProblemClassGetAll
+
+    private long AddProblemClass(ProblemClass problemClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        return adminClient.AddProblemClass(problemClass);
+      }
+
+      return 0;
+    }//AddProblemClass
+
+    public void DeleteProblemClass(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        adminClient.DeleteProblemClass(id);
+      }
+    }//DeleteProblemClass
+
+    public long SaveProblemClass(ProblemClass problemClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        if (problemClass.Id == 0) {
+          return AddProblemClass(problemClass);
+        } else {
+          ProblemClass pc = adminClient.GetProblemClass(problemClass.Id);
+
+          if (pc != null) {
+            adminClient.UpdateProblemClass(problemClass);
+            return problemClass.Id;
+          }
+        }
+      }
+
+      return 0;
+    }//SaveProblemClass
+
+    //***************************************Problems***************************************************
+    public IList<Problem> ProblemsGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<Problem> problemList = new List<Problem>();
+
+      if (adminClient != null) {
+        Problem[] problem = adminClient.GetProblems();
+        foreach (Problem pr in problem) {
+          problemList.Add(pr);
+
+        }
+      }//if (adminClient != null)
+
+      return problemList;
+    }//ProblemsGetAll
+
+    private long AddProblem(Problem problem) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        return adminClient.AddProblem(problem);
+      }
+
+      return 0;
+    }//AddProblem
+
+    public void DeleteProblem(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        adminClient.DeleteProblem(id);
+      }
+    }//DeleteProblem
+
+    public long SaveProblem(Problem problem) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      if (adminClient != null) {
+        if (problem.Id == 0) {
+          return AddProblem(problem);
+        } else {
+          Problem pr = adminClient.GetProblem(problem.Id);
+
+          if (pr != null) {
+            adminClient.UpdateProblem(problem);
+            return problem.Id;
+          }
+        }
+      }
+
+      return 0;
+    }//SaveProblem
+
+
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AlgorithmClassModel.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AlgorithmClassModel.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/AlgorithmClassModel.cs	(revision 6317)
@@ -9,103 +9,102 @@
 
 namespace HLWebOKBAdminPlugin.Models {
-    public class AlgorithmClassModel {        
+  public class AlgorithmClassModel {
 
-        public String SelectedSubMenu { get; set; }
-        public IList<AlgorithmClass> AlgorithmClasses { 
-            get { return AlgorithmClassGetAll(); }
-            set { ;}
+    public String SelectedSubMenu { get; set; }
+    public IList<AlgorithmClass> AlgorithmClasses {
+      get { return AlgorithmClassGetAll(); }
+      set { ;}
+    }
+
+    public AlgorithmClass AlgorithmClass { get; set; }
+
+    public AlgorithmClassModel() {
+      AlgorithmClass = new AlgorithmClass();
+    }//AlgorithmClassModel
+
+    //***************************************Algorithm Class********************************************
+    private IList<Platform> PlatformsGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<Platform> platformList = new List<Platform>();
+
+      if (adminClient != null) {
+        Platform[] platforms = adminClient.GetPlatforms();
+        foreach (Platform pl in platforms) {
+          platformList.Add(pl);
         }
+      }//if (adminClient != null)
 
-        public AlgorithmClass AlgorithmClass { get; set; }
+      return platformList;
+    }//ProblemClassGetAll
 
-        public AlgorithmClassModel() {
-            AlgorithmClass = new AlgorithmClass();
-        }//AlgorithmClassModel
+    private IList<ProblemClass> ProblemClassGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        //***************************************Algorithm Class********************************************
-        private IList<Platform> PlatformsGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      IList<ProblemClass> problemClassList = new List<ProblemClass>();
 
-            IList<Platform> platformList = new List<Platform>();
+      if (adminClient != null) {
+        ProblemClass[] problemClasses = adminClient.GetProblemClasses();
+        foreach (ProblemClass pc in problemClasses) {
+          problemClassList.Add(pc);
+        }
+      }//if (adminClient != null)
 
-            if (adminClient != null) {
-                Platform[] platforms = adminClient.GetPlatforms();
-                foreach (Platform pl in platforms) {
-                    platformList.Add(pl);
-                }
-            }//if (adminClient != null)
+      return problemClassList;
+    }//ProblemClassGetAll
 
-            return platformList;
-        }//ProblemClassGetAll
+    //get all algorithm classes
+    private IList<AlgorithmClass> AlgorithmClassGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        private IList<ProblemClass> ProblemClassGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      IList<AlgorithmClass> algorithmClassList = new List<AlgorithmClass>();
 
-            IList<ProblemClass> problemClassList = new List<ProblemClass>();
+      if (adminClient != null) {
+        AlgorithmClass[] algorithmClasses = adminClient.GetAlgorithmClasses();
+        foreach (AlgorithmClass ac in algorithmClasses) {
+          algorithmClassList.Add(ac);
 
-            if (adminClient != null) {
-                ProblemClass[] problemClasses = adminClient.GetProblemClasses();
-                foreach (ProblemClass pc in problemClasses) {
-                    problemClassList.Add(pc);
-                }
-            }//if (adminClient != null)
+        }
+      }//if (adminClient != null)
 
-            return problemClassList;
-        }//ProblemClassGetAll
+      return algorithmClassList;
+    }//AlgorithmClassGetAll
 
-        //get all algorithm classes
-        private IList<AlgorithmClass> AlgorithmClassGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+    private long AddAlgorithmClass(AlgorithmClass algorithmClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            IList<AlgorithmClass>  algorithmClassList = new List<AlgorithmClass>();
+      if (adminClient != null) {
+        return adminClient.AddAlgorithmClass(algorithmClass);
+      }
 
-            if (adminClient != null) {
-                AlgorithmClass[] algorithmClasses = adminClient.GetAlgorithmClasses();
-                foreach (AlgorithmClass ac in algorithmClasses) {
-                    algorithmClassList.Add(ac);
+      return 0;
+    }//AddAlgorithmClass
 
-                }
-            }//if (adminClient != null)
+    public void DeleteAlgorithmClass(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            return algorithmClassList;
-        }//AlgorithmClassGetAll
+      if (adminClient != null) {
+        adminClient.DeleteAlgorithmClass(id);
+      }
+    }//DeleteAlgorithmClass
 
-        private long AddAlgorithmClass(AlgorithmClass algorithmClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+    public long SaveAlgorithmClass(AlgorithmClass algorithmClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            if (adminClient != null) {
-                return adminClient.AddAlgorithmClass(algorithmClass);
-            }
+      if (adminClient != null) {
+        if (algorithmClass.Id == 0) {
+          return AddAlgorithmClass(algorithmClass);
+        } else {
+          AlgorithmClass ac = adminClient.GetAlgorithmClass(algorithmClass.Id);
 
-            return 0;
-        }//AddAlgorithmClass
+          if (ac != null) {
+            adminClient.UpdateAlgorithmClass(algorithmClass);
+            return algorithmClass.Id;
+          }
+        }
+      }
 
-        public void DeleteAlgorithmClass(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                adminClient.DeleteAlgorithmClass(id);
-            }
-        }//DeleteAlgorithmClass
-
-        public long SaveAlgorithmClass(AlgorithmClass algorithmClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                if (algorithmClass.Id == 0) {
-                    return AddAlgorithmClass(algorithmClass);
-                }
-                else {
-                    AlgorithmClass ac = adminClient.GetAlgorithmClass(algorithmClass.Id);
-
-                    if (ac != null) {
-                        adminClient.UpdateAlgorithmClass(algorithmClass);
-                        return algorithmClass.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveAlgorithmClass               
-    }
+      return 0;
+    }//SaveAlgorithmClass               
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/PlatformModel.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/PlatformModel.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/PlatformModel.cs	(revision 6317)
@@ -7,70 +7,69 @@
 
 namespace HLWebOKBAdminPlugin.Models {
-    public class PlatformModel {
-        public String SelectedSubMenu { get; set; }
-        public IList<Platform> Platforms { 
-            get { return PlatformGetAll();}
-            set {;}
+  public class PlatformModel {
+    public String SelectedSubMenu { get; set; }
+    public IList<Platform> Platforms {
+      get { return PlatformGetAll(); }
+      set { ;}
+    }
+
+    public Platform Platform { get; set; }
+
+    public PlatformModel() {
+      Platform = new Platform();
+    }//PlatformModel
+
+    //***************************************Platform Class**********************************************
+    private IList<Platform> PlatformGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<Platform> platformList = new List<Platform>();
+
+      if (adminClient != null) {
+        Platform[] platforms = adminClient.GetPlatforms();
+        foreach (Platform pl in platforms) {
+          platformList.Add(pl);
         }
+      }//if (adminClient != null)
 
-        public Platform Platform { get; set; }
+      return platformList;
+    }//ProblemClassGetAll                
 
-        public PlatformModel() {
-            Platform = new Platform();
-        }//PlatformModel
+    private long AddPlatform(Platform plattform) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        //***************************************Platform Class**********************************************
-        private IList<Platform> PlatformGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      if (adminClient != null) {
+        return adminClient.AddPlatform(plattform);
+      }
 
-            IList<Platform> platformList = new List<Platform>();
+      return 0;
+    }//AddPlatform
 
-            if (adminClient != null) {
-                Platform[] platforms = adminClient.GetPlatforms();
-                foreach (Platform pl in platforms) {
-                    platformList.Add(pl);
-                }
-            }//if (adminClient != null)
+    public void DeletePlatform(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            return platformList;
-        }//ProblemClassGetAll                
+      if (adminClient != null) {
+        adminClient.DeletePlatform(id);
+      }
+    }//DeletePlatform
 
-        private long AddPlatform(Platform plattform) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+    public long SavePlatform(Platform platform) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            if (adminClient != null) {
-                return adminClient.AddPlatform(plattform);
-            }
+      if (adminClient != null) {
+        if (platform.Id == 0) {
+          return AddPlatform(platform);
+        } else {
+          Platform pl = adminClient.GetPlatform(platform.Id);
 
-            return 0;
-        }//AddPlatform
+          if (pl != null) {
+            adminClient.UpdatePlatform(platform);
+            return platform.Id;
+          }
+        }
+      }
 
-        public void DeletePlatform(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                adminClient.DeletePlatform(id);
-            }
-        }//DeletePlatform
-
-        public long SavePlatform(Platform platform) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                if (platform.Id == 0) {
-                    return AddPlatform(platform);
-                }
-                else {
-                    Platform pl = adminClient.GetPlatform(platform.Id);
-
-                    if (pl != null) {
-                        adminClient.UpdatePlatform(platform);
-                        return platform.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SavePlatform        
-    }
+      return 0;
+    }//SavePlatform        
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemClassModel.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemClassModel.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemClassModel.cs	(revision 6317)
@@ -7,86 +7,85 @@
 
 namespace HLWebOKBAdminPlugin.Models {
-    public class ProblemClassModel {        
+  public class ProblemClassModel {
 
-        public String SelectedSubMenu { get; set; }
-        public IList<ProblemClass> ProblemClasses { 
-            get { return ProblemClassGetAll();}
-            set {;}
+    public String SelectedSubMenu { get; set; }
+    public IList<ProblemClass> ProblemClasses {
+      get { return ProblemClassGetAll(); }
+      set { ;}
+    }
+
+    public ProblemClass ProblemClass { get; set; }
+
+    public ProblemClassModel() {
+      ProblemClass = new ProblemClass();
+    }//ProblemClassModel
+
+    //***************************************Problem Class**********************************************
+    private IList<Platform> PlatformsGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<Platform> platformList = new List<Platform>();
+
+      if (adminClient != null) {
+        Platform[] platforms = adminClient.GetPlatforms();
+        foreach (Platform pl in platforms) {
+          platformList.Add(pl);
         }
+      }//if (adminClient != null)
 
-        public ProblemClass ProblemClass { get; set; }
+      return platformList;
+    }//ProblemClassGetAll
 
-        public ProblemClassModel() {
-            ProblemClass = new ProblemClass();
-        }//ProblemClassModel
+    private IList<ProblemClass> ProblemClassGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        //***************************************Problem Class**********************************************
-        private IList<Platform> PlatformsGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      IList<ProblemClass> problemClassList = new List<ProblemClass>();
 
-            IList<Platform> platformList = new List<Platform>();
+      if (adminClient != null) {
+        ProblemClass[] problemClasses = adminClient.GetProblemClasses();
+        foreach (ProblemClass pc in problemClasses) {
+          problemClassList.Add(pc);
+        }
+      }//if (adminClient != null)
 
-            if (adminClient != null) {
-                Platform[] platforms = adminClient.GetPlatforms();
-                foreach (Platform pl in platforms) {
-                    platformList.Add(pl);
-                }
-            }//if (adminClient != null)
+      return problemClassList;
+    }//ProblemClassGetAll
 
-            return platformList;
-        }//ProblemClassGetAll
-        
-        private IList<ProblemClass> ProblemClassGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+    private long AddProblemClass(ProblemClass problemClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            IList<ProblemClass> problemClassList = new List<ProblemClass>();
+      if (adminClient != null) {
+        return adminClient.AddProblemClass(problemClass);
+      }
 
-            if (adminClient != null) {
-                ProblemClass[] problemClasses = adminClient.GetProblemClasses();
-                foreach (ProblemClass pc in problemClasses) {
-                    problemClassList.Add(pc);
-                }
-            }//if (adminClient != null)
+      return 0;
+    }//AddProblemClass
 
-            return problemClassList;
-        }//ProblemClassGetAll
+    public void DeleteProblemClass(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        private long AddProblemClass(ProblemClass problemClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      if (adminClient != null) {
+        adminClient.DeleteProblemClass(id);
+      }
+    }//DeleteProblemClass
 
-            if (adminClient != null) {
-                return adminClient.AddProblemClass(problemClass);
-            }
+    public long SaveProblemClass(ProblemClass problemClass) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            return 0;
-        }//AddProblemClass
+      if (adminClient != null) {
+        if (problemClass.Id == 0) {
+          return AddProblemClass(problemClass);
+        } else {
+          ProblemClass pc = adminClient.GetProblemClass(problemClass.Id);
 
-        public void DeleteProblemClass(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+          if (pc != null) {
+            adminClient.UpdateProblemClass(problemClass);
+            return problemClass.Id;
+          }
+        }
+      }
 
-            if (adminClient != null) {
-                adminClient.DeleteProblemClass(id);
-            }
-        }//DeleteProblemClass
-
-        public long SaveProblemClass(ProblemClass problemClass) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                if (problemClass.Id == 0) {
-                    return AddProblemClass(problemClass);
-                }
-                else {
-                    ProblemClass pc = adminClient.GetProblemClass(problemClass.Id);
-
-                    if (pc != null) {
-                        adminClient.UpdateProblemClass(problemClass);
-                        return problemClass.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveProblemClass        
-    }
+      return 0;
+    }//SaveProblemClass        
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemModel.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemModel.cs	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemModel.cs	(revision 6317)
@@ -6,114 +6,112 @@
 using HLWebOKBAdminPlugin.Helpers;
 
-namespace HLWebOKBAdminPlugin.Models
-{
-    public class ProblemModel {
+namespace HLWebOKBAdminPlugin.Models {
+  public class ProblemModel {
 
-        public String SelectedSubMenu { get; set; }
-        public IList<Problem> Problems {
-            get { return ProblemsGetAll(); }
-            set { ;}
+    public String SelectedSubMenu { get; set; }
+    public IList<Problem> Problems {
+      get { return ProblemsGetAll(); }
+      set { ;}
+    }
+    public IList<ProblemClass> ProblemClasses { get { return ProblemClassGetAll(); } }
+    public IList<Platform> Platforms { get { return PlatformsGetAll(); } }
+
+    public Problem Problem { get; set; }
+
+    public ProblemModel() {
+      Problem = new Problem();
+    }//ProblemModel
+
+    //***************************************Problems***************************************************
+    private IList<Platform> PlatformsGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
+
+      IList<Platform> platformList = new List<Platform>();
+
+      if (adminClient != null) {
+        Platform[] platforms = adminClient.GetPlatforms();
+        foreach (Platform pl in platforms) {
+          platformList.Add(pl);
         }
-        public IList<ProblemClass> ProblemClasses { get { return ProblemClassGetAll(); } }
-        public IList<Platform> Platforms { get { return PlatformsGetAll(); } }
+      }//if (adminClient != null)
 
-        public Problem Problem { get; set; }
+      return platformList;
+    }//ProblemClassGetAll
 
-        public ProblemModel() {
-            Problem = new Problem();
-        }//ProblemModel
+    private IList<ProblemClass> ProblemClassGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        //***************************************Problems***************************************************
-        private IList<Platform> PlatformsGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      IList<ProblemClass> problemClassList = new List<ProblemClass>();
 
-            IList<Platform> platformList = new List<Platform>();
+      if (adminClient != null) {
+        ProblemClass[] problemClasses = adminClient.GetProblemClasses();
+        foreach (ProblemClass pc in problemClasses) {
+          problemClassList.Add(pc);
+        }
+      }//if (adminClient != null)
 
-            if (adminClient != null) {
-                Platform[] platforms = adminClient.GetPlatforms();
-                foreach (Platform pl in platforms) {
-                    platformList.Add(pl);
-                }
-            }//if (adminClient != null)
+      return problemClassList;
+    }//ProblemClassGetAll
 
-            return platformList;
-        }//ProblemClassGetAll
+    private IList<Problem> ProblemsGetAll() {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        private IList<ProblemClass> ProblemClassGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      IList<Problem> problemList = new List<Problem>();
 
-            IList<ProblemClass> problemClassList = new List<ProblemClass>();
+      if (adminClient != null) {
+        Problem[] problem = adminClient.GetProblems();
+        foreach (Problem pr in problem) {
+          problemList.Add(pr);
 
-            if (adminClient != null) {
-                ProblemClass[] problemClasses = adminClient.GetProblemClasses();
-                foreach (ProblemClass pc in problemClasses) {
-                    problemClassList.Add(pc);
-                }
-            }//if (adminClient != null)
+        }
+      }//if (adminClient != null)
 
-            return problemClassList;
-        }//ProblemClassGetAll
+      return problemList;
+    }//ProblemsGetAll
 
-        private IList<Problem> ProblemsGetAll() {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+    private long AddProblem(Problem problem) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            IList<Problem> problemList = new List<Problem>();
+      if (adminClient != null) {
+        return adminClient.AddProblem(problem);
+      }
 
-            if (adminClient != null) {
-                Problem[] problem = adminClient.GetProblems();
-                foreach (Problem pr in problem) {
-                    problemList.Add(pr);
+      return 0;
+    }//AddProblem
 
-                }
-            }//if (adminClient != null)
+    public void DeleteProblem(long id) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            return problemList;
-        }//ProblemsGetAll
+      if (adminClient != null) {
+        adminClient.DeleteProblem(id);
+      }
+    }//DeleteProblem
 
-        private long AddProblem(Problem problem) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+    public long SaveProblem(Problem problem) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            if (adminClient != null) {
-                return adminClient.AddProblem(problem);
-            }
+      if (adminClient != null) {
+        if (problem.Id == 0) {
+          return AddProblem(problem);
+        } else {
+          Problem pr = adminClient.GetProblem(problem.Id);
 
-            return 0;
-        }//AddProblem
+          if (pr != null) {
+            adminClient.UpdateProblem(problem);
+            return problem.Id;
+          }
+        }
+      }
 
-        public void DeleteProblem(long id) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
+      return 0;
+    }//SaveProblem
 
-            if (adminClient != null) {
-                adminClient.DeleteProblem(id);
-            }
-        }//DeleteProblem
+    public void UpdateProblemData(long id, byte[] data) {
+      AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-        public long SaveProblem(Problem problem) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                if (problem.Id == 0) {
-                    return AddProblem(problem);
-                }
-                else {
-                    Problem pr = adminClient.GetProblem(problem.Id);
-
-                    if (pr != null) {
-                        adminClient.UpdateProblem(problem);
-                        return problem.Id;
-                    }
-                }
-            }
-
-            return 0;
-        }//SaveProblem
-
-        public void UpdateProblemData(long id, byte[] data) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory();
-
-            if (adminClient != null) {
-                adminClient.UpdateProblemData(id, data);
-            }
-        }//UpdateProblemData
-    }
+      if (adminClient != null) {
+        adminClient.UpdateProblemData(id, data);
+      }
+    }//UpdateProblemData
+  }
 }
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Index.aspx	(revision 6317)
@@ -2,14 +2,11 @@
 
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu"); %>
+  <% Html.RenderAction("Menu"); %>
 </asp:Content>
-
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Index
+  Index
 </asp:Content>
-
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <h2>Index</h2>
-
+  <h2>
+    Index</h2>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Menu.ascx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Menu.ascx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Menu.ascx	(revision 6317)
@@ -1,19 +1,18 @@
 ﻿<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-
 <ul>
-<li <% if(Session["SelectedSubMenu"] == "Platform") {%> class="selected" <%}%>>
+  <li <% if(Session["SelectedSubMenu"] == "Platform") {%> class="selected" <%}%>>
     <%: Html.ActionLink("Platform", "Index", "Platform")%>
-</li>
-<li <% if(Session["SelectedSubMenu"] == "AlgorithmClass") {%> class="selected" <%}%>>
+  </li>
+  <li <% if(Session["SelectedSubMenu"] == "AlgorithmClass") {%> class="selected" <%}%>>
     <%: Html.ActionLink("AlgorithmClass", "Index", "AlgorithmClass")%>
-</li>
-<li <% if(Session["SelectedSubMenu"] == "Algorithm") {%> class="selected" <%}%>>
+  </li>
+  <li <% if(Session["SelectedSubMenu"] == "Algorithm") {%> class="selected" <%}%>>
     <%: Html.ActionLink("Algorithm", "Index", "Algorithm")%>
-</li>
-<li <% if(Session["SelectedSubMenu"] == "ProblemClass") {%> class="selected" <%}%>>
+  </li>
+  <li <% if(Session["SelectedSubMenu"] == "ProblemClass") {%> class="selected" <%}%>>
     <%: Html.ActionLink("ProblemClass", "Index", "ProblemClass")%>
-</li>
-<li <% if(Session["SelectedSubMenu"] == "Problem") {%> class="selected" <%}%>>
+  </li>
+  <li <% if(Session["SelectedSubMenu"] == "Problem") {%> class="selected" <%}%>>
     <%: Html.ActionLink("Problem", "Index", "Problem") %>
-</li>
+  </li>
 </ul>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Detail.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Detail.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Detail.aspx	(revision 6317)
@@ -4,131 +4,127 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-    Detail
+  Detail
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <% using(Html.BeginForm("SaveChanges", "Algorithm")) %>
-    <% { %>
-    <h2>
-        Detail</h2>
-    <%
+  <% using (Html.BeginForm("SaveChanges", "Algorithm")) %>
+  <% { %>
+  <h2>
+    Detail</h2>
+  <%
      
-        // The Model will be filled via the Controller
-        // Maybe we can use here the Problem instead
-        // of the ProblemModel. But this must be changed
-        // in the Controller too!
+    // The Model will be filled via the Controller
+    // Maybe we can use here the Problem instead
+    // of the ProblemModel. But this must be changed
+    // in the Controller too!
 
-        Algorithm p = ((AlgorithmModel)Model).Algorithm;
-    %>
-
-            <div class="hl-menuButtons">                 
-        <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
-        </div>
-
-    <table class="hl-table">
-        <tr>
-            <th>
-                Id:
-            </th>
-            <td>
-                <%: Html.Label(p.Id.ToString())%>
-            </td>
-            <%: Html.Hidden("AlgorithmId", p.Id.ToString(), p.Id.ToString())%>
-        </tr>
-        <tr>
-            <th>
-                Name:
-            </th>
-            <td>
-                <%: Html.TextBox("AlgorithmName", p.Name, p.Name)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Description:
-            </th>
-            <td>
-                <%: Html.TextBox("AlgorithmDescription", p.Description, p.Description)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                DataTypeName:
-            </th>
-            <td>
-                <%: Html.TextBox("AlgorithmDataTypeName", p.DataTypeName, p.DataTypeName)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Algorith Class:
-            </th>
-            <td>
-                <select name="AlgorithmClassId">
-                    <% foreach(AlgorithmClass pc in ((AlgorithmModel)Model).AlgorithmClasses) {  %>
-                        <% if(p.AlgorithmClassId == pc.Id) { %>
-                            <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } else { %>
-                            <option value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } %>
-                    <% } %>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Platform:
-            </th>
-            <td>
-                <select name="PlatformId">
-                    <% foreach(Platform pc in ((AlgorithmModel)Model).Platforms) {  %>
-                        <% if(p.PlatformId == pc.Id) { %>
-                            <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } else { %>
-                            <option value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } %>
-                    <% } %>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Action:
-            </th>
-            <td>
-                <input type="submit" value="save" />
-            </td>
-        </tr>
-    </table>    
-    
-    <% } %>
-
-    <% using (Html.BeginForm("UploadFile", "Algorithm", FormMethod.Post, new { enctype = "multipart/form-data" }))
-    {%><br />
-        <% Algorithm p = ((AlgorithmModel)Model).Algorithm; %>        
-        <table class="hl-table">
-            <tr>
-                <th>
-                    File:
-                </th>
-                <td>
-                    <%: Html.Hidden("AlgorithmId", p.Id.ToString(), p.Id.ToString())%>
-                    <input type="file" name="files" id="file2" size="25" /> 
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    Action:
-                </th>
-                <td>
-                    <input type="submit" value="Upload file" />
-                </td>
-            </tr>
-        </table> 
-
-        <% } %> 
-        
-
+    Algorithm p = ((AlgorithmModel)Model).Algorithm;
+  %>
+  <div class="hl-menuButtons">
+    <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
+  </div>
+  <table class="hl-table">
+    <tr>
+      <th>
+        Id:
+      </th>
+      <td>
+        <%: Html.Label(p.Id.ToString())%>
+      </td>
+      <%: Html.Hidden("AlgorithmId", p.Id.ToString(), p.Id.ToString())%>
+    </tr>
+    <tr>
+      <th>
+        Name:
+      </th>
+      <td>
+        <%: Html.TextBox("AlgorithmName", p.Name, p.Name)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Description:
+      </th>
+      <td>
+        <%: Html.TextBox("AlgorithmDescription", p.Description, p.Description)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        DataTypeName:
+      </th>
+      <td>
+        <%: Html.TextBox("AlgorithmDataTypeName", p.DataTypeName, p.DataTypeName)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Algorith Class:
+      </th>
+      <td>
+        <select name="AlgorithmClassId">
+          <% foreach (AlgorithmClass pc in ((AlgorithmModel)Model).AlgorithmClasses) {  %>
+          <% if (p.AlgorithmClassId == pc.Id) { %>
+          <option selected="selected" value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } else { %>
+          <option value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } %>
+          <% } %>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Platform:
+      </th>
+      <td>
+        <select name="PlatformId">
+          <% foreach (Platform pc in ((AlgorithmModel)Model).Platforms) {  %>
+          <% if (p.PlatformId == pc.Id) { %>
+          <option selected="selected" value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } else { %>
+          <option value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } %>
+          <% } %>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="save" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
+  <% using (Html.BeginForm("UploadFile", "Algorithm", FormMethod.Post, new { enctype = "multipart/form-data" })) {%><br />
+  <% Algorithm p = ((AlgorithmModel)Model).Algorithm; %>
+  <table class="hl-table">
+    <tr>
+      <th>
+        File:
+      </th>
+      <td>
+        <%: Html.Hidden("AlgorithmId", p.Id.ToString(), p.Id.ToString())%>
+        <input type="file" name="files" id="file2" size="25" />
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="Upload file" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Index.aspx	(revision 6317)
@@ -14,13 +14,21 @@
   <%  long? id = null;  %>
   <div class="hl-menuButtons">
-  <%: Html.ActionLink("New Algorithm", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
+    <%: Html.ActionLink("New Algorithm", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
   </div>
   <table class="hl-dataTable">
     <thead>
       <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Type</th>
-        <th>Actions</th>
+        <th>
+          Name
+        </th>
+        <th>
+          Description
+        </th>
+        <th>
+          Type
+        </th>
+        <th>
+          Actions
+        </th>
       </tr>
     </thead>
@@ -38,8 +46,8 @@
           <%: p.DataTypeName %>
         </td>
-                <td class="hl-iconcell">
-                    <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
-                    <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
-                </td>
+        <td class="hl-iconcell">
+          <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
+          <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
+        </td>
       </tr>
       <% } %>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Detail.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Detail.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Detail.aspx	(revision 6317)
@@ -4,53 +4,53 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-    Detail
+  Detail
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <% using (Html.BeginForm("SaveChanges", "AlgorithmClass")) %>
-    <% { %>
-    <h2>Detail</h2>
-            <div class="hl-menuButtons">                 
-        <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
-        </div>
-    <% AlgorithmClass ac = ((AlgorithmClassModel)Model).AlgorithmClass; %>
-    <table class="hl-table">
-        <tr>
-            <th>
-                Id:
-            </th>
-            <td>
-                <%: Html.Label(ac.Id.ToString())%>
-            </td>
-            <%: Html.Hidden("AlgorithmClassId", ac.Id.ToString(), ac.Id.ToString())%>
-        </tr>
-        <tr>
-            <th>
-                Name:
-            </th>
-            <td>
-                <%: Html.TextBox("AlgorithmClassName", ac.Name, ac.Name)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Description:
-            </th>
-            <td>
-                <%: Html.TextBox("AlgorithmClassDescription", ac.Description, ac.Description)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Action:
-            </th>
-            <td>
-                <input type="submit" value="save" />
-            </td>
-        </tr>
-    </table> 
-   
-    <% } %>
+  <% using (Html.BeginForm("SaveChanges", "AlgorithmClass")) %>
+  <% { %>
+  <h2>
+    Detail</h2>
+  <div class="hl-menuButtons">
+    <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
+  </div>
+  <% AlgorithmClass ac = ((AlgorithmClassModel)Model).AlgorithmClass; %>
+  <table class="hl-table">
+    <tr>
+      <th>
+        Id:
+      </th>
+      <td>
+        <%: Html.Label(ac.Id.ToString())%>
+      </td>
+      <%: Html.Hidden("AlgorithmClassId", ac.Id.ToString(), ac.Id.ToString())%>
+    </tr>
+    <tr>
+      <th>
+        Name:
+      </th>
+      <td>
+        <%: Html.TextBox("AlgorithmClassName", ac.Name, ac.Name)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Description:
+      </th>
+      <td>
+        <%: Html.TextBox("AlgorithmClassDescription", ac.Description, ac.Description)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="save" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Index.aspx	(revision 6317)
@@ -3,47 +3,48 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.Models" %>
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
-
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-    Index
+  Index
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <h2>AlgorithmClass</h2>
-
-<%  long? id = null;  %>
-<div class="hl-menuButtons">
+  <h2>
+    AlgorithmClass</h2>
+  <%  long? id = null;  %>
+  <div class="hl-menuButtons">
     <%: Html.ActionLink("New AlgorithmClass", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
-</div>
-
-
-        <table class="hl-dataTable">
-        <thead>
-        <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Actions</th>
-        </tr>
-        </thead>
-        <tbody>
-            <!--// We get this from the Controller (Index)-->
-            <% foreach (AlgorithmClass p in ((AlgorithmClassModel)Model).AlgorithmClasses) {  %>
-            <tr>
-                <td>
-                    <%: p.Name %>
-                </td>
-                <td>
-                    <%: p.Description %>
-                </td>
-                <td class="hl-iconcell">
-                    <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
-                    <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
-                </td>
-            </tr>
-            <% } %>
-            </tbody>
-        </table>
-  
+  </div>
+  <table class="hl-dataTable">
+    <thead>
+      <tr>
+        <th>
+          Name
+        </th>
+        <th>
+          Description
+        </th>
+        <th>
+          Actions
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <!--// We get this from the Controller (Index)-->
+      <% foreach (AlgorithmClass p in ((AlgorithmClassModel)Model).AlgorithmClasses) {  %>
+      <tr>
+        <td>
+          <%: p.Name %>
+        </td>
+        <td>
+          <%: p.Description %>
+        </td>
+        <td class="hl-iconcell">
+          <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
+          <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
+        </td>
+      </tr>
+      <% } %>
+    </tbody>
+  </table>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Home/About.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Home/About.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Home/About.aspx	(revision 6317)
@@ -2,11 +2,11 @@
 
 <asp:Content ID="aboutTitle" ContentPlaceHolderID="TitleContent" runat="server">
-	About
+  About
 </asp:Content>
-
 <asp:Content ID="aboutContent" ContentPlaceHolderID="MainContent" runat="server">
-<h2>About</h2>
-    <p>
-        Put content here.
-    </p>
+  <h2>
+    About</h2>
+  <p>
+    Put content here.
+  </p>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Home/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Home/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Home/Index.aspx	(revision 6317)
@@ -2,11 +2,12 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Home Page
+  Home Page
 </asp:Content>
-
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
- <h2><%: ViewData["Message"] %></h2>
-    <p>
-        To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.
-    </p>
+  <h2>
+    <%: ViewData["Message"] %></h2>
+  <p>
+    To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">
+      http://asp.net/mvc</a>.
+  </p>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Platform/Detail.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Platform/Detail.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Platform/Detail.aspx	(revision 6317)
@@ -3,54 +3,54 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.Models" %>
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
-
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Detail
+  Detail
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <% using(Html.BeginForm("SaveChanges", "Platform")) %>
-    <% { %>
-    <h2>Detail</h2>
-            <div class="hl-menuButtons">                 
-        <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
-        </div>
-    <% Platform pc = ((PlatformModel)Model).Platform; %>
-    <table class="hl-table">
-        <tr>
-            <th>
-                Id:
-            </th>
-            <td>
-                <%: Html.Label(pc.Id.ToString())%>
-            </td>
-            <%: Html.Hidden("PlatformId", pc.Id.ToString(), pc.Id.ToString())%>
-        </tr>
-        <tr>
-            <th>
-                Name:
-            </th>
-            <td>
-                <%: Html.TextBox("PlatformName", pc.Name, pc.Name)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Description:
-            </th>
-            <td>
-                <%: Html.TextBox("PlatformDescription", pc.Description, pc.Description)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Action:
-            </th>
-            <td>
-                <input type="submit" value="save" />
-            </td>
-        </tr>
-    </table> 
-    <% } %>
+  <% using (Html.BeginForm("SaveChanges", "Platform")) %>
+  <% { %>
+  <h2>
+    Detail</h2>
+  <div class="hl-menuButtons">
+    <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
+  </div>
+  <% Platform pc = ((PlatformModel)Model).Platform; %>
+  <table class="hl-table">
+    <tr>
+      <th>
+        Id:
+      </th>
+      <td>
+        <%: Html.Label(pc.Id.ToString())%>
+      </td>
+      <%: Html.Hidden("PlatformId", pc.Id.ToString(), pc.Id.ToString())%>
+    </tr>
+    <tr>
+      <th>
+        Name:
+      </th>
+      <td>
+        <%: Html.TextBox("PlatformName", pc.Name, pc.Name)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Description:
+      </th>
+      <td>
+        <%: Html.TextBox("PlatformDescription", pc.Description, pc.Description)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="save" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Platform/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Platform/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Platform/Index.aspx	(revision 6317)
@@ -3,48 +3,48 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.Models" %>
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
-
-
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Index
+  Index
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <h2>Platform</h2>
-
-<%  long? id = null;  %>
-<div class="hl-menuButtons">
+  <h2>
+    Platform</h2>
+  <%  long? id = null;  %>
+  <div class="hl-menuButtons">
     <%: Html.ActionLink("New Platform", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
-</div>
-
-        <table class="hl-dataTable">
-                <thead>
-        <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Actions</th>
-        </tr>
-        </thead>
-        <tbody>
-            <!--// We get this from the Controller (Index)-->
-            <% foreach (Platform p in ((PlatformModel)Model).Platforms) {  %>
-            <tr>
-                <td>
-                    <%: p.Name %>
-                </td>
-                <td>
-                    <%: p.Description %>
-                </td>
-                <td class="hl-iconcell">
-                    <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
-                    <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
-                </td>
-
-            </tr>
-            <% } %>
-        </tbody>
-        </table>
-  
+  </div>
+  <table class="hl-dataTable">
+    <thead>
+      <tr>
+        <th>
+          Name
+        </th>
+        <th>
+          Description
+        </th>
+        <th>
+          Actions
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <!--// We get this from the Controller (Index)-->
+      <% foreach (Platform p in ((PlatformModel)Model).Platforms) {  %>
+      <tr>
+        <td>
+          <%: p.Name %>
+        </td>
+        <td>
+          <%: p.Description %>
+        </td>
+        <td class="hl-iconcell">
+          <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
+          <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
+        </td>
+      </tr>
+      <% } %>
+    </tbody>
+  </table>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Detail.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Detail.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Detail.aspx	(revision 6317)
@@ -4,128 +4,127 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-    Detail
+  Detail
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <% using(Html.BeginForm("SaveChanges", "Problem")) %>
-    <% { %>
-    <h2>
-        Detail</h2>
-    <%
+  <% using (Html.BeginForm("SaveChanges", "Problem")) %>
+  <% { %>
+  <h2>
+    Detail</h2>
+  <%
      
-        // The Model will be filled via the Controller
-        // Maybe we can use here the Problem instead
-        // of the ProblemModel. But this must be changed
-        // in the Controller too!
+    // The Model will be filled via the Controller
+    // Maybe we can use here the Problem instead
+    // of the ProblemModel. But this must be changed
+    // in the Controller too!
 
-        Problem p = ((ProblemModel)Model).Problem;
-    %>
-            <div class="hl-menuButtons">                 
-        <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
-        </div>
-    <table class="hl-table">
-        <tr>
-            <th>
-                Id:
-            </th>
-            <td>
-                <%: Html.Label(p.Id.ToString())%>
-            </td>
-            <%: Html.Hidden("ProblemId", p.Id.ToString(), p.Id.ToString())%>
-        </tr>
-        <tr>
-            <th>
-                Name:
-            </th>
-            <td>
-                <%: Html.TextBox("ProblemName", p.Name, p.Name)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Description:
-            </th>
-            <td>
-                <%: Html.TextBox("ProblemDescription", p.Description, p.Description)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                DataTypeName:
-            </th>
-            <td>
-                <%: Html.TextBox("ProblemDataTypeName", p.DataTypeName, p.DataTypeName)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Problem Class:
-            </th>
-            <td>
-                <select name="ProblemClassId">
-                    <% foreach(ProblemClass pc in ((ProblemModel)Model).ProblemClasses) {  %>
-                        <% if(p.ProblemClassId == pc.Id) { %>
-                            <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } else { %>
-                            <option value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } %>
-                    <% } %>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Platform:
-            </th>
-            <td>
-                <select name="PlatformId">
-                    <% foreach(Platform pc in ((ProblemModel)Model).Platforms) {  %>
-                        <% if(p.PlatformId == pc.Id) { %>
-                            <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } else { %>
-                            <option value="<%=pc.Id%>"><%=pc.Name%></option>
-                        <% } %>
-                    <% } %>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Action:
-            </th>
-            <td>
-                <input type="submit" value="save" />
-            </td>
-        </tr>
-    </table>    
-    
-    <% } %>
-
-    <% using (Html.BeginForm("UploadFile", "Problem", FormMethod.Post, new { enctype = "multipart/form-data" }))
-    {%><br />
-        <% Problem p = ((ProblemModel)Model).Problem; %>        
-        <table class="hl-table">
-            <tr>
-                <th>
-                    File:
-                </th>
-                <td>
-                    <%: Html.Hidden("ProblemId", p.Id.ToString(), p.Id.ToString()) %>
-                    <input type="file" name="files" id="file2" size="25" /> 
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    Action:
-                </th>
-                <td>
-                    <input type="submit" value="Upload file" />
-                </td>
-            </tr>
-        </table>                              
-        <% } %> 
-        
-
+    Problem p = ((ProblemModel)Model).Problem;
+  %>
+  <div class="hl-menuButtons">
+    <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
+  </div>
+  <table class="hl-table">
+    <tr>
+      <th>
+        Id:
+      </th>
+      <td>
+        <%: Html.Label(p.Id.ToString())%>
+      </td>
+      <%: Html.Hidden("ProblemId", p.Id.ToString(), p.Id.ToString())%>
+    </tr>
+    <tr>
+      <th>
+        Name:
+      </th>
+      <td>
+        <%: Html.TextBox("ProblemName", p.Name, p.Name)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Description:
+      </th>
+      <td>
+        <%: Html.TextBox("ProblemDescription", p.Description, p.Description)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        DataTypeName:
+      </th>
+      <td>
+        <%: Html.TextBox("ProblemDataTypeName", p.DataTypeName, p.DataTypeName)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Problem Class:
+      </th>
+      <td>
+        <select name="ProblemClassId">
+          <% foreach (ProblemClass pc in ((ProblemModel)Model).ProblemClasses) {  %>
+          <% if (p.ProblemClassId == pc.Id) { %>
+          <option selected="selected" value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } else { %>
+          <option value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } %>
+          <% } %>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Platform:
+      </th>
+      <td>
+        <select name="PlatformId">
+          <% foreach (Platform pc in ((ProblemModel)Model).Platforms) {  %>
+          <% if (p.PlatformId == pc.Id) { %>
+          <option selected="selected" value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } else { %>
+          <option value="<%=pc.Id%>">
+            <%=pc.Name%></option>
+          <% } %>
+          <% } %>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="save" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
+  <% using (Html.BeginForm("UploadFile", "Problem", FormMethod.Post, new { enctype = "multipart/form-data" })) {%><br />
+  <% Problem p = ((ProblemModel)Model).Problem; %>
+  <table class="hl-table">
+    <tr>
+      <th>
+        File:
+      </th>
+      <td>
+        <%: Html.Hidden("ProblemId", p.Id.ToString(), p.Id.ToString()) %>
+        <input type="file" name="files" id="file2" size="25" />
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="Upload file" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Index.aspx	(revision 6317)
@@ -4,49 +4,53 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-    Index
+  Index
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <h2>Problems</h2>
-    
-    
-    
-    <%  long? id = null;  %>
-    <div class="hl-menuButtons">
+  <h2>
+    Problems</h2>
+  <%  long? id = null;  %>
+  <div class="hl-menuButtons">
     <%: Html.ActionLink("New Problem", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
-    </div>
-
-        <table class="hl-dataTable">
-        <thead>
-        <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Type</th>
-        <th>Actions</th>
-        </tr>
-        </thead>
-        <tbody>
-            <!--// We get this from the Controller (Index)-->
-            <% foreach(Problem p in ((ProblemModel)Model).Problems) {  %>
-            <tr>
-                <td>
-                    <%: p.Name%>
-                </td>
-                <td>
-                    <%: p.Description %>
-                </td>
-                <td>
-                    <%: p.DataTypeName %>
-                </td>
-                <td class="hl-iconcell">
-                    <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
-                    <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
-                </td>
-            </tr>
-            <% } %>
-            </tbody>
-        </table>
-     
+  </div>
+  <table class="hl-dataTable">
+    <thead>
+      <tr>
+        <th>
+          Name
+        </th>
+        <th>
+          Description
+        </th>
+        <th>
+          Type
+        </th>
+        <th>
+          Actions
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <!--// We get this from the Controller (Index)-->
+      <% foreach (Problem p in ((ProblemModel)Model).Problems) {  %>
+      <tr>
+        <td>
+          <%: p.Name%>
+        </td>
+        <td>
+          <%: p.Description %>
+        </td>
+        <td>
+          <%: p.DataTypeName %>
+        </td>
+        <td class="hl-iconcell">
+          <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
+          <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
+        </td>
+      </tr>
+      <% } %>
+    </tbody>
+  </table>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Detail.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Detail.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Detail.aspx	(revision 6317)
@@ -3,54 +3,54 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.Models" %>
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
-
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Detail
+  Detail
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <% using(Html.BeginForm("SaveChanges", "ProblemClass")) %>
-    <% { %>
-    <h2>Detail</h2>
-            <div class="hl-menuButtons">                 
-        <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
-        </div>
-    <% ProblemClass pc = ((ProblemClassModel)Model).ProblemClass; %>
-    <table class="hl-table">
-        <tr>
-            <th>
-                Id:
-            </th>
-            <td>
-                <%: Html.Label(pc.Id.ToString())%>
-            </td>
-            <%: Html.Hidden("ProblemClassId", pc.Id.ToString(), pc.Id.ToString())%>
-        </tr>
-        <tr>
-            <th>
-                Name:
-            </th>
-            <td>
-                <%: Html.TextBox("ProblemClassName", pc.Name, pc.Name)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Description:
-            </th>
-            <td>
-                <%: Html.TextBox("ProblemClassDescription", pc.Description, pc.Description)%>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Action:
-            </th>
-            <td>
-                <input type="submit" value="save" />
-            </td>
-        </tr>
-    </table> 
-    <% } %>
+  <% using (Html.BeginForm("SaveChanges", "ProblemClass")) %>
+  <% { %>
+  <h2>
+    Detail</h2>
+  <div class="hl-menuButtons">
+    <%: Html.ActionLink("Back to Index", "Index", null, new { @class = "hl-button-text-back" })%>
+  </div>
+  <% ProblemClass pc = ((ProblemClassModel)Model).ProblemClass; %>
+  <table class="hl-table">
+    <tr>
+      <th>
+        Id:
+      </th>
+      <td>
+        <%: Html.Label(pc.Id.ToString())%>
+      </td>
+      <%: Html.Hidden("ProblemClassId", pc.Id.ToString(), pc.Id.ToString())%>
+    </tr>
+    <tr>
+      <th>
+        Name:
+      </th>
+      <td>
+        <%: Html.TextBox("ProblemClassName", pc.Name, pc.Name)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Description:
+      </th>
+      <td>
+        <%: Html.TextBox("ProblemClassDescription", pc.Description, pc.Description)%>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        Action:
+      </th>
+      <td>
+        <input type="submit" value="save" />
+      </td>
+    </tr>
+  </table>
+  <% } %>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Index.aspx	(revision 6317)
@@ -3,48 +3,48 @@
 <%@ Import Namespace="HLWebOKBAdminPlugin.Models" %>
 <%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
-
-
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Index
+  Index
 </asp:Content>
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu", "Admin"); %>
+  <% Html.RenderAction("Menu", "Admin"); %>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <h2>ProblemClass</h2>
-
-<%  long? id = null;  %>
-<div class="hl-menuButtons">
+  <h2>
+    ProblemClass</h2>
+  <%  long? id = null;  %>
+  <div class="hl-menuButtons">
     <%: Html.ActionLink("New ProblemClass", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
-</div>
-
-        <table class="hl-dataTable">
-                <thead>
-        <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Actions</th>
-        </tr>
-        </thead>
-        <tbody>
-            <!--// We get this from the Controller (Index)-->
-            <% foreach (ProblemClass p in ((ProblemClassModel)Model).ProblemClasses) {  %>
-            <tr>
-                <td>
-                    <%: p.Name%>
-                </td>
-                <td>
-                    <%: p.Description %>
-                </td>
-                <td class="hl-iconcell">
-                    <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
-                    <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
-                </td>
-
-            </tr>
-            <% } %>
-        </tbody>
-        </table>
-  
+  </div>
+  <table class="hl-dataTable">
+    <thead>
+      <tr>
+        <th>
+          Name
+        </th>
+        <th>
+          Description
+        </th>
+        <th>
+          Actions
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <!--// We get this from the Controller (Index)-->
+      <% foreach (ProblemClass p in ((ProblemClassModel)Model).ProblemClasses) {  %>
+      <tr>
+        <td>
+          <%: p.Name%>
+        </td>
+        <td>
+          <%: p.Description %>
+        </td>
+        <td class="hl-iconcell">
+          <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
+          <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
+        </td>
+      </tr>
+      <% } %>
+    </tbody>
+  </table>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ServiceTest/Index.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ServiceTest/Index.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ServiceTest/Index.aspx	(revision 6317)
@@ -2,18 +2,14 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Index
+  Index
 </asp:Content>
-
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <form id="form1" runat="server">
-
-    <h2>Index</h2>
-    <p>
-        <asp:GridView ID="GridView1" runat="server">
-        </asp:GridView>
-    </p>
-
-    </form>
-
+  <form id="form1" runat="server">
+  <h2>
+    Index</h2>
+  <p>
+    <asp:GridView ID="GridView1" runat="server">
+    </asp:GridView>
+  </p>
+  </form>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Error.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Error.aspx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Error.aspx	(revision 6317)
@@ -2,10 +2,9 @@
 
 <asp:Content ID="errorTitle" ContentPlaceHolderID="TitleContent" runat="server">
-    Error
+  Error
 </asp:Content>
-
 <asp:Content ID="errorContent" ContentPlaceHolderID="MainContent" runat="server">
-    <h2>
-        Sorry, an error occurred while processing your request.
-    </h2>
+  <h2>
+    Sorry, an error occurred while processing your request.
+  </h2>
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/LogOnUserControl.ascx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/LogOnUserControl.ascx	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/LogOnUserControl.ascx	(revision 6317)
@@ -1,14 +1,17 @@
 ﻿<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
 <%
-    if (Request.IsAuthenticated) {
+  if (Request.IsAuthenticated) {
 %>
-        Welcome <b><%: Page.User.Identity.Name %></b>!
-        [ <%: Html.ActionLink("Log Off", "LogOff", "Account") %> ]
+Welcome <b>
+  <%: Page.User.Identity.Name %></b>! [
+<%: Html.ActionLink("Log Off", "LogOff", "Account") %>
+]
 <%
-    }
-    else {
-%> 
-        [ <%: Html.ActionLink("Log On", "LogOn", "Account") %> ]
+  } else {
+%>
+[
+<%: Html.ActionLink("Log On", "LogOn", "Account") %>
+]
 <%
-    }
+  }
 %>
Index: branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Site.Master
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Site.Master	(revision 6316)
+++ branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Site.Master	(revision 6317)
@@ -28,9 +28,8 @@
       </div>
     </div>
-
     <div id="main">
-        <div id="master-submenu">
-      <asp:ContentPlaceHolder ID="SubMenuContent" runat="server" />
-    </div>
+      <div id="master-submenu">
+        <asp:ContentPlaceHolder ID="SubMenuContent" runat="server" />
+      </div>
       <asp:ContentPlaceHolder ID="MainContent" runat="server" />
       <div id="footer">
