Fixes merge issues, ensures that the UmbracoContext is set for the async operation since

it is required, previous versions didn't require it to be set. Added the WebSecurity property
to UmbracoUserControl, made ContentTypeControlNew inherit from UmbracoUserControl

src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs

@@ -5,6 +5,7 @@ using System.Web.Routing;
 using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Services;
+using Umbraco.Web.Security;
 using umbraco.DataLayer;
 
 namespace Umbraco.Web.UI.Controls
@@ -44,6 +45,14 @@ namespace Umbraco.Web.UI.Controls
         /// </summary>
         public UmbracoHelper Umbraco { get; private set; }
 
+        /// <summary>
+        /// Returns the current WebSecurity instance
+        /// </summary>
+        public WebSecurity Security
+        {
+            get { return UmbracoContext.Security; }
+        }
+
         /// <summary>
         /// Returns the current UmbracoContext
         /// </summary>