diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index d3ab992a2332..e8bf606dc399 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -20,6 +20,7 @@
+
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 1efd3052aa55..b4beacbf1d08 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1,1089 +1,1103 @@
-
-
-
-
- 9.0.30729
- 2.0
- {4C4C194C-B5E4-4991-8F87-4373E24CC19F}
- {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
- Debug
- AnyCPU
-
-
-
-
- Umbraco.Web.UI
-
-
- JScript
- Grid
- IE50
- false
- Library
- Umbraco.Web.UI
- OnBuildSuccess
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4.0
- v4.5
-
- true
-
-
- enabled
- disabled
- false
- ..\
- true
- true
-
-
-
-
- bin\
- false
- 285212672
- false
-
-
- TRACE;DEBUG
-
-
- true
- 4096
- false
-
-
- false
- false
- false
- false
- 4
- full
- prompt
- AllRules.ruleset
- false
- ..\bin\Debug\
- true
- ..\Package\Umbraco.Web.UI.zip
-
-
- bin\
- false
- 285212672
- false
-
-
- TRACE
- bin\Umbraco.Web.UI.XML
- true
- 4096
- false
-
-
- true
- false
- false
- false
- 4
- pdbonly
- prompt
- AllRules.ruleset
- false
- ..\bin\Release\
-
-
-
- {07fbc26b-2927-4a22-8d96-d644c667fecc}
- UmbracoExamine
-
-
- ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll
- True
-
-
- ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll
- True
-
-
- ..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll
-
-
- ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll
- True
-
-
- ..\packages\dotless.1.5.2\lib\dotless.Core.dll
-
-
- ..\packages\Examine.0.1.89\lib\net45\Examine.dll
-
-
- ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
-
-
- ..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll
-
-
- ..\packages\ImageProcessor.Web.4.8.7\lib\net45\ImageProcessor.Web.dll
-
-
- ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll
-
-
- ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll
-
-
- ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll
- True
-
-
- False
- ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll
-
-
- ..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll
-
-
- ..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll
-
-
-
- ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll
-
-
- ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll
-
-
- ..\packages\Microsoft.Owin.Host.SystemWeb.3.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll
-
-
- ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll
-
-
- ..\packages\Microsoft.Owin.Security.Cookies.3.1.0\lib\net45\Microsoft.Owin.Security.Cookies.dll
-
-
- ..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll
-
-
- True
- ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
-
- False
- ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
-
-
- ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll
-
-
- ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll
-
-
- ..\packages\Owin.1.0\lib\net40\Owin.dll
- True
-
-
- System
-
-
- ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
-
-
- System.Data
-
-
-
- ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll
- True
-
-
- ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll
- True
-
-
-
-
-
-
- False
- False
-
-
- False
- ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
-
-
- False
- False
-
-
- ..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
-
-
- System.Web
-
-
- 3.5
-
-
-
-
-
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll
- True
-
-
- False
- ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll
-
-
- False
- ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll
-
-
- ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll
- True
-
-
- ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll
- True
-
-
- System.Web.Services
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll
- True
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll
- True
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll
- True
-
-
- System.XML
-
-
- {5BA5425F-27A7-4677-865E-82246498AA2E}
- SqlCE4Umbraco
-
-
- {31785bc3-256c-4613-b2f5-a1b0bdded8c1}
- Umbraco.Core
-
-
- {255F5DF1-4E43-4758-AC05-7A0B68EB021B}
- umbraco.editorControls
-
-
- {89C09045-1064-466B-B94A-DB3AFE2A5853}
- umbraco.MacroEngines
-
-
- {6EDD2061-82F2-461B-BB6E-879245A832DE}
- umbraco.controls
-
-
- umbraco.businesslogic
- {E469A9CE-1BEC-423F-AC44-713CD72457EA}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- {CCD75EC3-63DB-4184-B49D-51C1DD337230}
- umbraco.cms
-
-
- {C7CB79F0-1C97-4B33-BFA7-00731B579AE2}
- umbraco.datalayer
-
-
- umbraco.interfaces
- {511F6D8D-7717-440A-9A57-A507E9A8B27F}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- {651E1350-91B6-44B7-BD60-7207006D7003}
- Umbraco.Web
-
-
- {D7636876-0756-43CB-A192-138C6F0D5E42}
- umbraco.providers
-
-
-
- ..\packages\Umbraco.ModelsBuilder.3.0.10\lib\Umbraco.ModelsBuilder.dll
-
-
-
-
- Properties\SolutionInfo.cs
-
-
- noNodes.aspx
- ASPXCodeBehind
-
-
- noNodes.aspx
- ASPXCodeBehind
-
-
-
- True
- True
- Settings.settings
-
-
- create.aspx
- ASPXCodeBehind
-
-
- create.aspx
-
-
- xslt.ascx
- ASPXCodeBehind
-
-
- xslt.ascx
-
-
- UserControlProxy.aspx
- ASPXCodeBehind
-
-
- UserControlProxy.aspx
-
-
- editMacro.aspx
- ASPXCodeBehind
-
-
- editMacro.aspx
-
-
- directoryBrowser.aspx
- ASPXCodeBehind
-
-
- directoryBrowser.aspx
-
-
- ChangeDocType.aspx
- ASPXCodeBehind
-
-
- ChangeDocType.aspx
-
-
- EditMacro.aspx
- ASPXCodeBehind
-
-
- sort.aspx
- ASPXCodeBehind
-
-
- sort.aspx
- ASPXCodeBehind
-
-
- EditMacro.aspx
-
-
- publish.aspx
- ASPXCodeBehind
-
-
- publish.aspx
-
-
- default.Master
- ASPXCodeBehind
-
-
- default.Master
-
-
- ASPXCodeBehind
-
-
- umbracoDialog.Master
-
-
- ASPXCodeBehind
-
-
- umbracoPage.Master
-
-
- QuickSearch.ascx
- ASPXCodeBehind
-
-
- QuickSearch.ascx
-
-
- editstylesheet.aspx
- ASPXCodeBehind
-
-
- editstylesheet.aspx
-
-
- EditStyleSheetProperty.aspx
- ASPXCodeBehind
-
-
- EditStyleSheetProperty.aspx
-
-
- treeInit.aspx
- ASPXCodeBehind
-
-
- treeInit.aspx
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- umbraco.aspx
- ASPXCodeBehind
-
-
- umbraco.aspx
-
-
-
-
-
-
-
-
-
-
-
- 404handlers.config
-
-
-
- ClientDependency.config
- Designer
-
-
- Designer
-
-
- BaseRestExtensions.config
-
-
-
-
- Designer
-
-
- log4net.config
-
-
- FileSystemProviders.config
-
-
- EmbeddedMedia.config
-
-
- Designer
-
-
- HealthChecks.config
- Designer
-
-
- umbracoSettings.config
- Designer
-
-
- trees.config
-
-
- tinyMceConfig.config
- Designer
-
-
- scripting.config
-
-
- ExamineSettings.config
-
-
- feedProxy.config
-
-
- ExamineIndex.config
- Designer
-
-
- Dashboard.config
- Designer
-
-
-
-
- Designer
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- UI.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ASPXCodeBehind
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Designer
-
-
-
-
-
-
-
- Designer
-
-
-
- Designer
-
-
-
-
-
- Designer
-
-
- applications.config
- Designer
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
- Designer
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Web.Template.config
- Designer
-
-
- Web.Template.config
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- UserControl
-
-
-
- UserControl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- Form
-
-
- Form
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
-
-
-
-
- Form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Designer
-
-
-
- Designer
-
-
- Designer
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 11.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0
-
-
-
- xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
-xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D
-
-
-
-
-
-
-
-
-
- True
- True
- 7130
- /
- http://localhost:7130
- False
- False
-
-
- False
-
-
-
-
-
-
-
- $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll
-
-
- $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v14.0\Web\Microsoft.Web.Publishing.Tasks.dll
-
-
- $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v12.0\Web\Microsoft.Web.Publishing.Tasks.dll
-
-
- $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\Web\Microsoft.Web.Publishing.Tasks.dll
-
-
- $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 9.0.30729
+ 2.0
+ {4C4C194C-B5E4-4991-8F87-4373E24CC19F}
+ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
+ Debug
+ AnyCPU
+
+
+
+
+ Umbraco.Web.UI
+
+
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ Umbraco.Web.UI
+ OnBuildSuccess
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4.0
+ v4.5
+
+ true
+
+
+ enabled
+ disabled
+ false
+ ..\
+ true
+ true
+
+
+
+
+
+
+ bin\
+ false
+ 285212672
+ false
+
+
+ TRACE;DEBUG
+
+
+ true
+ 4096
+ false
+
+
+ false
+ false
+ false
+ false
+ 4
+ full
+ prompt
+ AllRules.ruleset
+ false
+ ..\bin\Debug\
+ true
+ ..\Package\Umbraco.Web.UI.zip
+
+
+ bin\
+ false
+ 285212672
+ false
+
+
+ TRACE
+ bin\Umbraco.Web.UI.XML
+ true
+ 4096
+ false
+
+
+ true
+ false
+ false
+ false
+ 4
+ pdbonly
+ prompt
+ AllRules.ruleset
+ false
+ ..\bin\Release\
+
+
+
+ {07fbc26b-2927-4a22-8d96-d644c667fecc}
+ UmbracoExamine
+
+
+ ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll
+ True
+
+
+ ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll
+ True
+
+
+ ..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll
+
+
+ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll
+ True
+
+
+ ..\packages\dotless.1.5.2\lib\dotless.Core.dll
+
+
+ ..\packages\Examine.0.1.89\lib\net45\Examine.dll
+
+
+ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
+
+
+ ..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll
+
+
+ ..\packages\ImageProcessor.Web.4.8.7\lib\net45\ImageProcessor.Web.dll
+
+
+ ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll
+
+
+ ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll
+
+
+ ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll
+ True
+
+
+ False
+ ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll
+
+
+ ..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll
+
+
+ ..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll
+
+
+ ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
+
+
+
+ ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll
+
+
+ ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll
+
+
+ ..\packages\Microsoft.Owin.Host.SystemWeb.3.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll
+
+
+ ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll
+
+
+ ..\packages\Microsoft.Owin.Security.Cookies.3.1.0\lib\net45\Microsoft.Owin.Security.Cookies.dll
+
+
+ ..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll
+
+
+ True
+ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
+
+
+ False
+ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
+
+
+ ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll
+
+
+ ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll
+
+
+ ..\packages\Owin.1.0\lib\net40\Owin.dll
+ True
+
+
+ System
+
+
+ ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
+
+
+
+
+ System.Data
+
+
+
+ ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll
+ True
+
+
+ ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll
+ True
+
+
+
+
+
+
+ False
+ False
+
+
+ False
+ ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
+
+
+ False
+ False
+
+
+ ..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll
+
+
+
+
+ System.Web
+
+
+ 3.5
+
+
+
+
+
+
+
+ ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll
+ True
+
+
+ False
+ ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll
+
+
+ False
+ ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll
+
+
+ ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll
+ True
+
+
+ ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll
+ True
+
+
+ System.Web.Services
+
+
+ ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll
+ True
+
+
+ ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll
+ True
+
+
+ ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll
+ True
+
+
+ System.XML
+
+
+ {5BA5425F-27A7-4677-865E-82246498AA2E}
+ SqlCE4Umbraco
+
+
+ {31785bc3-256c-4613-b2f5-a1b0bdded8c1}
+ Umbraco.Core
+
+
+ {255F5DF1-4E43-4758-AC05-7A0B68EB021B}
+ umbraco.editorControls
+
+
+ {89C09045-1064-466B-B94A-DB3AFE2A5853}
+ umbraco.MacroEngines
+
+
+ {6EDD2061-82F2-461B-BB6E-879245A832DE}
+ umbraco.controls
+
+
+ umbraco.businesslogic
+ {E469A9CE-1BEC-423F-AC44-713CD72457EA}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+
+
+ {CCD75EC3-63DB-4184-B49D-51C1DD337230}
+ umbraco.cms
+
+
+ {C7CB79F0-1C97-4B33-BFA7-00731B579AE2}
+ umbraco.datalayer
+
+
+ umbraco.interfaces
+ {511F6D8D-7717-440A-9A57-A507E9A8B27F}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+
+
+ {651E1350-91B6-44B7-BD60-7207006D7003}
+ Umbraco.Web
+
+
+ {D7636876-0756-43CB-A192-138C6F0D5E42}
+ umbraco.providers
+
+
+
+ ..\packages\Umbraco.ModelsBuilder.3.0.10\lib\Umbraco.ModelsBuilder.dll
+
+
+
+
+ Properties\SolutionInfo.cs
+
+
+ noNodes.aspx
+ ASPXCodeBehind
+
+
+ noNodes.aspx
+ ASPXCodeBehind
+
+
+
+ True
+ True
+ Settings.settings
+
+
+ create.aspx
+ ASPXCodeBehind
+
+
+ create.aspx
+
+
+ xslt.ascx
+ ASPXCodeBehind
+
+
+ xslt.ascx
+
+
+ UserControlProxy.aspx
+ ASPXCodeBehind
+
+
+ UserControlProxy.aspx
+
+
+ editMacro.aspx
+ ASPXCodeBehind
+
+
+ editMacro.aspx
+
+
+ directoryBrowser.aspx
+ ASPXCodeBehind
+
+
+ directoryBrowser.aspx
+
+
+ ChangeDocType.aspx
+ ASPXCodeBehind
+
+
+ ChangeDocType.aspx
+
+
+ EditMacro.aspx
+ ASPXCodeBehind
+
+
+ sort.aspx
+ ASPXCodeBehind
+
+
+ sort.aspx
+ ASPXCodeBehind
+
+
+ EditMacro.aspx
+
+
+ publish.aspx
+ ASPXCodeBehind
+
+
+ publish.aspx
+
+
+ default.Master
+ ASPXCodeBehind
+
+
+ default.Master
+
+
+ ASPXCodeBehind
+
+
+ umbracoDialog.Master
+
+
+ ASPXCodeBehind
+
+
+ umbracoPage.Master
+
+
+ QuickSearch.ascx
+ ASPXCodeBehind
+
+
+ QuickSearch.ascx
+
+
+ editstylesheet.aspx
+ ASPXCodeBehind
+
+
+ editstylesheet.aspx
+
+
+ EditStyleSheetProperty.aspx
+ ASPXCodeBehind
+
+
+ EditStyleSheetProperty.aspx
+
+
+ treeInit.aspx
+ ASPXCodeBehind
+
+
+ treeInit.aspx
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ umbraco.aspx
+ ASPXCodeBehind
+
+
+ umbraco.aspx
+
+
+
+
+
+
+
+
+
+
+
+ 404handlers.config
+
+
+
+ ClientDependency.config
+ Designer
+
+
+ Designer
+
+
+ BaseRestExtensions.config
+
+
+
+
+ Designer
+
+
+ log4net.config
+
+
+ FileSystemProviders.config
+
+
+ EmbeddedMedia.config
+
+
+ Designer
+
+
+ HealthChecks.config
+ Designer
+
+
+ umbracoSettings.config
+ Designer
+
+
+ trees.config
+
+
+ tinyMceConfig.config
+ Designer
+
+
+ scripting.config
+
+
+ ExamineSettings.config
+
+
+ feedProxy.config
+
+
+ ExamineIndex.config
+ Designer
+
+
+ Dashboard.config
+ Designer
+
+
+
+
+ Designer
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+ UI.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ASPXCodeBehind
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+
+
+
+
+
+
+
+ Designer
+
+
+
+ Designer
+
+
+
+
+
+ Designer
+
+
+ applications.config
+ Designer
+
+
+
+
+
+
+
+
+ Code
+
+
+
+
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Web.Template.config
+ Designer
+
+
+ Web.Template.config
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ UserControl
+
+
+
+ UserControl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Form
+
+
+ Form
+
+
+ Form
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Form
+
+
+
+
+
+
+ Form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0
+
+
+
+ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
+xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D
+
+
+
+
+
+
+
+
+
+ True
+ True
+ 7130
+ /
+ http://localhost:7130
+ False
+ False
+
+
+ False
+
+
+
+
+
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v14.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v12.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
+
+ $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index a27a63329ee2..55f638f76c74 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -22,7 +22,9 @@
+
+
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index 014fe143294a..741d4d192ddc 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -318,8 +318,6 @@
-
-
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index b4f046b277e9..10794e6aa22b 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -1,456 +1,463 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+