Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

# Conflicts:
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs

src/Umbraco.Core/Editors/BackOfficePreviewModel.cs

@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Hosting;
 using Umbraco.Core.Models;
 using Umbraco.Web.Features;
 
@@ -10,7 +7,7 @@ namespace Umbraco.Web.Editors
     public class BackOfficePreviewModel
     {
         private readonly UmbracoFeatures _features;
-        
+
         public BackOfficePreviewModel(UmbracoFeatures features, IEnumerable<ILanguage> languages)
         {
             _features = features;

src/Umbraco.Core/Models/IconModel.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Web.Models
+namespace Umbraco.Core.Models
 {
     public class IconModel
     {

src/Umbraco.Core/Services/IIconService.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models;
+
+namespace Umbraco.Core.Services
+{
+    public interface IIconService
+    {
+        /// <summary>
+        /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
+        /// </summary>
+        /// <param name="iconName"></param>
+        /// <returns></returns>
+        IconModel GetIcon(string iconName);
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        IList<IconModel> GetAllIcons();
+    }
+}