Merge

src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -12,7 +11,7 @@ using Umbraco.Core;
 
 namespace Umbraco.Web.UI.Umbraco
 {
-    public partial class UmbracoMainPage : Pages.UmbracoEnsuredPage
+    public partial class Umbraco : Pages.UmbracoEnsuredPage
 	{        
         public string DefaultApp { get; private set; }
 

src/Umbraco.Web.UI/umbraco/Umbraco.aspx.designer.cs

@@ -10,7 +10,7 @@
 namespace Umbraco.Web.UI.Umbraco {
 
 
-    public partial class UmbracoMainPage
+    public partial class Umbraco
     {
         
         /// <summary>

src/Umbraco.Web.UI/umbraco/umbraco.aspx

@@ -1,5 +1,5 @@
 <%@ Page Trace="false" Language="c#" CodeBehind="umbraco.aspx.cs" AutoEventWireup="True"
-    Inherits="Umbraco.Web.UI.Umbraco.UmbracoMainPage" %>
+    Inherits="Umbraco.Web.UI.Umbraco.Umbraco" %>
 
 <%@ Import Namespace="System.Web.Script.Serialization" %>
 

src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs

@@ -14,7 +14,9 @@ namespace umbraco.presentation.LiveEditing.Modules.ItemEditing
     /// </summary>
     public class LiveEditingItemRenderer : ItemRenderer
     {
-        //public const string RICHTEXTEDITOR_DATATYPE_ID = "{5E9B75AE-FACE-41c8-B47E-5F4B0FD82F83}";
+        [Obsolete("Use Umbraco.Core.Constants.PropertyEditors.TinyMCEv3 instead")]
+        public const string RichtexteditorDatatypeId = Constants.PropertyEditors.TinyMCEv3;
+        
         /// <summary>Returns the instance of <see cref="LiveEditingItemRenderer"/>.</summary>
         public new readonly static LiveEditingItemRenderer Instance = new LiveEditingItemRenderer();