Merge branch 'temp8' into temp8-p188

src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Web.Models.Mapping
     {
         private readonly ContentApp _contentApp = new ContentApp
         {
-            Alias = "content",
+            Alias = "umbContent",
             Name = "Content",
             Icon = "icon-document",
             View = "views/content/apps/content/content.html"
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.Mapping
 
         private readonly ContentApp _infoApp = new ContentApp
         {
-            Alias = "info",
+            Alias = "umbInfo",
             Name = "Info",
             Icon = "icon-info",
             View = "views/content/apps/info/info.html"

src/Umbraco.Web/Models/Mapping/ContentAppResolverExtensions.cs

@@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.Mapping
         {
             var listViewApp = new ContentApp
             {
-                Alias = "childItems",
+                Alias = "umbListView",
                 Name = "Child items",
                 Icon = "icon-list",
                 View = "views/content/apps/listview/listview.html"

src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Web.Models.Mapping
     {
         private static readonly ContentApp _contentApp = new ContentApp
         {
-            Alias = "content",
+            Alias = "umbContent",
             Name = "Content",
             Icon = "icon-document",
             View = "views/media/apps/content/content.html"
@@ -20,7 +20,7 @@ namespace Umbraco.Web.Models.Mapping
 
         private static readonly ContentApp _infoApp = new ContentApp
         {
-            Alias = "info",
+            Alias = "umbInfo",
             Name = "Info",
             Icon = "icon-info",
             View = "views/media/apps/info/info.html"