Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

1 files changed, 2 insertions, 9 deletions

diff --git a/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs
index bf487b760..382183b58 100644
--- a/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs
+++ b/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs
@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using ServiceStack.Common;
@@ -9,6 +7,7 @@ using ServiceStack.Common.Web;
 using ServiceStack.ServiceHost;
 using ServiceStack.ServiceInterface;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -23,12 +22,6 @@ namespace MediaBrowser.Common.Implementations.HttpServer
     public class BaseRestService : Service, IRestfulService
     {
         /// <summary>
-        /// Gets or sets the kernel.
-        /// </summary>
-        /// <value>The kernel.</value>
-        public IKernel Kernel { get; set; }
-
-        /// <summary>
         /// Gets or sets the logger.
         /// </summary>
         /// <value>The logger.</value>