Fixes more merge issues, project builds and runs

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return ""; } }
+        public static string CurrentComment { get { return "beta"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

src/Umbraco.Web/DefaultHttpContextAccessor.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Web;
+
+namespace Umbraco.Web
+{
+    internal class DefaultHttpContextAccessor : IHttpContextAccessor
+    {
+        private readonly Func<HttpContextBase> _httpContext;
+
+        public DefaultHttpContextAccessor(Func<HttpContextBase> httpContext)
+        {
+            _httpContext = httpContext;
+        }
+
+        public HttpContextBase Value
+        {
+            get { return _httpContext(); }
+        }
+    }
+}

src/Umbraco.Web/Umbraco.Web.csproj

@@ -327,6 +327,7 @@
     <Compile Include="ApplicationContextExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
+    <Compile Include="DefaultHttpContextAccessor.cs" />
     <Compile Include="DefaultUmbracoContextAccessor.cs" />
     <Compile Include="Editors\BackOfficeNotificationsController.cs" />
     <Compile Include="LightInjectExtensions.cs" />

src/Umbraco.Web/WebBootManager.cs

@@ -322,6 +322,7 @@ namespace Umbraco.Web
 
             container.EnablePerWebRequestScope();
 
+            container.RegisterSingleton<IHttpContextAccessor, DefaultHttpContextAccessor>();
             container.RegisterSingleton<IUmbracoContextAccessor, DefaultUmbracoContextAccessor>();
             container.RegisterSingleton<IPublishedContentCache>(factory => new PublishedContentCache());
             container.RegisterSingleton<IPublishedMediaCache, PublishedMediaCache>();