From 696239fda813072184733407050d09fe90c34d1e Mon Sep 17 00:00:00 2001
From: jasperd <none@none>
Date: Mon, 25 Nov 2013 08:26:36 +0100
Subject: [PATCH 01/21] #17216: Theme codegen creates a Zones folder in the
 theme

Work Item: 17216
---
 .../Commands/CodeGenerationCommands.cs                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 4b819452d..dcbb9347c 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -19,11 +19,11 @@ namespace Orchard.CodeGeneration.Commands {
         private const string SolutionDirectoryModules = "E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5";
         private const string SolutionDirectoryThemes = "74492CBC-7201-417E-BC29-28B4C25A58B0";
 
-        private static readonly string[] _themeDirectories = new [] {
-            "", "Content", "Styles", "Scripts", "Views", "Zones"
+        private static readonly string[] _themeDirectories = {
+	        "", "Content", "Styles", "Scripts", "Views"
         };
-        private static readonly string[] _moduleDirectories = new [] {
-            "", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles"
+        private static readonly string[] _moduleDirectories = {
+	        "", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles"
         };
 
         private const string ModuleName = "CodeGeneration";

From f033b78afe911671ee9eceb6670c1443ad2bd392 Mon Sep 17 00:00:00 2001
From: Tony Mackay <tony@viewmodel.net>
Date: Fri, 22 Nov 2013 13:28:27 +0000
Subject: [PATCH 02/21] #20299: Fixed validation summary not being displayed

Work Item: 20299
---
 .../Orchard.Comments/Controllers/CommentController.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
index 38c4fec44..56ff22f49 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
@@ -35,19 +35,19 @@ namespace Orchard.Comments.Controllers {
             var editorShape = Services.ContentManager.UpdateEditor(comment, this);
 
 
-            if (!ModelState.IsValidField("Author")) {
+            if (!ModelState.IsValidField("Comments.Author")) {
                 Services.Notifier.Error(T("Name is mandatory and must have less than 255 chars"));
             }
 
-            if (!ModelState.IsValidField("Email")) {
+            if (!ModelState.IsValidField("Comments.Email")) {
                 Services.Notifier.Error(T("Email is invalid or is longer than 255 chars"));
             }
 
-            if (!ModelState.IsValidField("Site")) {
+            if (!ModelState.IsValidField("Comments.Site")) {
                 Services.Notifier.Error(T("Site url is invalid or is longer than 255 chars"));
             }
 
-            if (!ModelState.IsValidField("CommentText")) {
+            if (!ModelState.IsValidField("Comments.CommentText")) {
                 Services.Notifier.Error(T("Comment is mandatory"));
             }
 

From c418e098546a84d4354c28e51ebf8074c3272828 Mon Sep 17 00:00:00 2001
From: Jay Harris <jay@aranasoft.com>
Date: Tue, 19 Nov 2013 19:13:18 -0500
Subject: [PATCH 03/21] Fix issue 20292. In Definition Template, checkboxes
 were improperly inverted between the edit and publish columns. Also, default
 permissions were improperly wired up between PublishOwn and View permissions.

---
 .../Drivers/ContentPermissionsPartDriver.cs      |  2 +-
 .../ContentPermissionsPartViewModel.cshtml       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
index a294aef02..5e3fcf9af 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
@@ -177,7 +177,7 @@ namespace Orchard.ContentPermissions.Drivers {
             }
 
             if (!_authorizer.Authorize(Core.Contents.Permissions.PublishOwnContent, part.ContentItem)) {
-                part.PublishOwnContent = settings == null ? ContentPermissionsPartViewModel.SerializePermissions(allRoles.Select(x => new RoleEntry {Role = x, Checked = _authorizationService.TryCheckAccess(Core.Contents.Permissions.ViewContent, UserSimulation.Create(x), null)})) : settings.PublishOwn;
+                part.PublishOwnContent = settings == null ? ContentPermissionsPartViewModel.SerializePermissions(allRoles.Select(x => new RoleEntry {Role = x, Checked = _authorizationService.TryCheckAccess(Core.Contents.Permissions.PublishOwnContent, UserSimulation.Create(x), null)})) : settings.PublishOwn;
             }
 
             if (!_authorizer.Authorize(Core.Contents.Permissions.EditContent, part.ContentItem)) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
index 889859042..396574d13 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
@@ -30,15 +30,15 @@
                     </td>
                     <td>
                         <label>
-                            <input type="checkbox" disabled="disabled" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
-                            <input type="checkbox" value="true" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishRoles[role.Index].Checked)" @if (!Model.PublishRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
+                            <input type="checkbox" disabled="disabled" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
+                            <input type="checkbox" value="true" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.EditRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.EditRoles[role.Index].Checked)" @if (!Model.EditRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
                         @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
                     </td>
                     <td>
                         <label>
-                            <input type="checkbox" disabled="disabled" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
-                            <input type="checkbox" value="true" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.EditRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.EditRoles[role.Index].Checked)" @if (!Model.EditRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
+                            <input type="checkbox" disabled="disabled" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
+                            <input type="checkbox" value="true" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishRoles[role.Index].Checked)" @if (!Model.PublishRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
                         @Html.HiddenFor(m => m.EditRoles[role.Index].Role)
                     </td>
@@ -74,15 +74,15 @@
                     </td>
                     <td>
                         <label>
-                            <input type="checkbox" disabled="disabled" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
-                            <input type="checkbox" value="true" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishOwnRoles[role.Index].Checked)" @if (!Model.PublishOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
+                            <input type="checkbox" disabled="disabled" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
+                            <input type="checkbox" value="true" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.EditOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.EditOwnRoles[role.Index].Checked)" @if (!Model.EditOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
                         @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
                     </td>
                     <td>
                         <label>
-                            <input type="checkbox" disabled="disabled" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
-                            <input type="checkbox" value="true" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.EditOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.EditOwnRoles[role.Index].Checked)" @if (!Model.EditOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
+                            <input type="checkbox" disabled="disabled" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
+                            <input type="checkbox" value="true" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishOwnRoles[role.Index].Checked)" @if (!Model.PublishOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
                         @Html.HiddenFor(m => m.EditOwnRoles[role.Index].Role)
                     </td>

From d679231271bc612124720bfc713a9622917b9433 Mon Sep 17 00:00:00 2001
From: Jay Harris <jay@aranasoft.com>
Date: Tue, 19 Nov 2013 19:17:50 -0500
Subject: [PATCH 04/21] #20292: Added Role field update for Definition Template

Work Item: 20292
---
 .../ContentPermissionsPartViewModel.cshtml                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
index 396574d13..b318e1c74 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
@@ -33,14 +33,14 @@
                             <input type="checkbox" disabled="disabled" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
                             <input type="checkbox" value="true" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.EditRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.EditRoles[role.Index].Checked)" @if (!Model.EditRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
-                        @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
+                        @Html.HiddenFor(m => m.EditRoles[role.Index].Role)
                     </td>
                     <td>
                         <label>
                             <input type="checkbox" disabled="disabled" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
                             <input type="checkbox" value="true" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishRoles[role.Index].Checked)" @if (!Model.PublishRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
-                        @Html.HiddenFor(m => m.EditRoles[role.Index].Role)
+                        @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
                     </td>
                     <td>
                         <label>
@@ -77,14 +77,14 @@
                             <input type="checkbox" disabled="disabled" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
                             <input type="checkbox" value="true" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.EditOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.EditOwnRoles[role.Index].Checked)" @if (!Model.EditOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
-                        @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
+                        @Html.HiddenFor(m => m.EditOwnRoles[role.Index].Role)
                     </td>
                     <td>
                         <label>
                             <input type="checkbox" disabled="disabled" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Default value"/>
                             <input type="checkbox" value="true" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishOwnRoles[role.Index].Checked)" @if (!Model.PublishOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
                         </label>
-                        @Html.HiddenFor(m => m.EditOwnRoles[role.Index].Role)
+                        @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
                     </td>
                     <td>
                         <label>

From ef5b5e46ce9f4fe988c3d2aa02f86b96710e1699 Mon Sep 17 00:00:00 2001
From: Henry Kuijpers <>
Date: Thu, 14 Nov 2013 15:44:01 +0100
Subject: [PATCH 05/21] #20279: Preventing email duplicate when using owner

Work Item: 20279
---
 .../Modules/Orchard.Email/Activities/MailActivity.cs            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Activities/MailActivity.cs b/src/Orchard.Web/Modules/Orchard.Email/Activities/MailActivity.cs
index e5a4c3d8b..4684b04a7 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Activities/MailActivity.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Activities/MailActivity.cs
@@ -70,8 +70,6 @@ namespace Orchard.Email.Activities {
                     if (owner != null && owner.ContentItem != null && owner.ContentItem.Record != null) {
                         _messageManager.Send(owner.ContentItem.Record, MessageType, "email", properties);
                     }
-                    _messageManager.Send(
-                        SplitEmail(owner.As<IUser>().Email), MessageType, "email", properties);
                 }
             }
             else if (recipient == "author") {

From ee1bcb497ba37f8a1cfe79c093c5d9b21ba39e96 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@thelifestylepress.com>
Date: Mon, 11 Nov 2013 08:59:09 -0500
Subject: [PATCH 06/21] Adding ClickToBuildAzurePackage back

Signed-off-by: Sebastien Ros <sebastien.ros@microsoft.com>
---
 .gitignore                   |  1 +
 ClickToBuildAzurePackage.cmd | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 ClickToBuildAzurePackage.cmd

diff --git a/.gitignore b/.gitignore
index fc3ff0d47..18cf32456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 [Rr]elease/
 x64/
 build/
+app.publish/
 [Bb]in/
 [Oo]bj/
 
diff --git a/ClickToBuildAzurePackage.cmd b/ClickToBuildAzurePackage.cmd
new file mode 100644
index 000000000..ecf14a785
--- /dev/null
+++ b/ClickToBuildAzurePackage.cmd
@@ -0,0 +1,32 @@
+if "%WindowsSdkDir%" neq "" goto build
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" goto initialize2k12on64
+if exist "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" goto initialize2k12
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" goto initialize2k10on64
+if exist "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" goto initialize2k10
+echo "Unable to detect suitable environment. Build may not succeed."
+goto build
+
+
+:initialize2k10
+call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+goto build
+
+:initialize2k10on64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+goto build
+
+:initialize2k12
+call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+goto build
+
+:initialize2k12on64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+goto build
+
+:build
+msbuild src\Orchard.Azure\Orchard.Azure.CloudService\Orchard.Azure.CloudService.ccproj /p:Configuration=Release /p:Platform="Any CPU" /t:Publish /p:OutputPath="%cd%\\" /p:outdir="%cd%\build"
+pause
+goto end
+
+
+:end

From 0c124207eb3f54f9a1c3d5105eb477774fbc3dd5 Mon Sep 17 00:00:00 2001
From: Jeff Olmstead <jeff.olmstead@endlessmountainsolutions.com>
Date: Wed, 6 Nov 2013 12:37:52 -0500
Subject: [PATCH 07/21] #19401: Adding tenant specific log information

Work Item: 19401

Signed-off-by: Sebastien Ros <sebastien.ros@microsoft.com>
---
 src/Orchard.Web/Config/log4net.config       |  4 +-
 src/Orchard/Logging/OrchardLog4netLogger.cs | 86 ++++++++++++++++++++-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Config/log4net.config b/src/Orchard.Web/Config/log4net.config
index e129ba1a2..d28757088 100644
--- a/src/Orchard.Web/Config/log4net.config
+++ b/src/Orchard.Web/Config/log4net.config
@@ -61,7 +61,7 @@
 		<!-- Prevents Orchard.exe from displaying locking debug messages. -->
 		<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
 		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%date [%thread] %logger - %message%newline" />
+      <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %message%newline" />
 		</layout>
 	</appender>
 
@@ -81,7 +81,7 @@
 			<levelMin value="ERROR" />
 		</filter>
 		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%date [%thread] %logger - %message%newline" />
+      <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %message%newline %P{Url}%newline" />
 		</layout>
 	</appender>
 	
diff --git a/src/Orchard/Logging/OrchardLog4netLogger.cs b/src/Orchard/Logging/OrchardLog4netLogger.cs
index d204495a8..ebf9a1eca 100644
--- a/src/Orchard/Logging/OrchardLog4netLogger.cs
+++ b/src/Orchard/Logging/OrchardLog4netLogger.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Globalization;
 
+using System.Web;
+using Orchard.Environment;
+using Orchard.Environment.Configuration;
 using log4net;
 using log4net.Core;
 using log4net.Util;
@@ -9,10 +12,13 @@ using Logger = Castle.Core.Logging.ILogger;
 
 namespace Orchard.Logging {
     [Serializable]
-    public class OrchardLog4netLogger : MarshalByRefObject, Logger {
+    public class OrchardLog4netLogger : MarshalByRefObject, Logger, IShim {
         private static readonly Type declaringType = typeof(OrchardLog4netLogger);
+        public IOrchardHostContainer HostContainer { get; set; }
+        private ShellSettings _shellSettings;
 
         public OrchardLog4netLogger(log4net.Core.ILogger logger, OrchardLog4netFactory factory) {
+            OrchardHostContainerRegistry.RegisterShim(this);
             Logger = logger;
             Factory = factory;
         }
@@ -24,6 +30,49 @@ namespace Orchard.Logging {
             : this(log.Logger, factory) {
         }
 
+        // Return a per class variable for each instance of the logger, which is for each tenant.  This variable allows outputting the tenant name
+        private ShellSettings ShellSettings {
+            get {
+                if (_shellSettings == null) {
+                    var ctx = HttpContext.Current;
+                    if (ctx == null)
+                        return null;
+
+                    var runningShellTable = HostContainer.Resolve<IRunningShellTable>();
+                    if (runningShellTable == null)
+                        return null;
+
+                    var shellSettings = runningShellTable.Match(new HttpContextWrapper(ctx));
+                    if (shellSettings == null)
+                        return null;
+
+                    var orchardHost = HostContainer.Resolve<IOrchardHost>();
+                    if (orchardHost == null)
+                        return null;
+
+                    var shellContext = orchardHost.GetShellContext(shellSettings);
+                    if (shellContext == null || shellContext.Settings == null)
+                        return null;
+
+                    _shellSettings = shellContext.Settings;
+                }
+
+                return _shellSettings;
+            }
+        }
+
+        // Load the log4net thread with additional properties if they are available
+        protected internal void AddExtendedThreadInfo() {
+            if (ShellSettings != null) {
+                ThreadContext.Properties["Tenant"] = ShellSettings.Name;
+            }
+
+            var ctx = HttpContext.Current;
+            if (ctx != null)             {
+                ThreadContext.Properties["Url"] = ctx.Request.Url.ToString();
+            }
+        }
+
         public bool IsDebugEnabled {
             get { return Logger.IsEnabledFor(Level.Debug); }
         }
@@ -58,210 +107,245 @@ namespace Orchard.Logging {
 
         public void Debug(String message) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, message, null);
             }
         }
 
         public void Debug(Func<string> messageFactory) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, messageFactory.Invoke(), null);
             }
         }
 
         public void Debug(String message, Exception exception) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, message, exception);
             }
         }
 
         public void DebugFormat(String format, params Object[] args) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), null);
             }
         }
 
         public void DebugFormat(Exception exception, String format, params Object[] args) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), exception);
             }
         }
 
         public void DebugFormat(IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, new SystemStringFormat(formatProvider, format, args), null);
             }
         }
 
         public void DebugFormat(Exception exception, IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsDebugEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Debug, new SystemStringFormat(formatProvider, format, args), exception);
             }
         }
 
         public void Error(String message) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, message, null);
             }
         }
 
         public void Error(Func<string> messageFactory) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, messageFactory.Invoke(), null);
             }
         }
 
         public void Error(String message, Exception exception) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, message, exception);
             }
         }
 
         public void ErrorFormat(String format, params Object[] args) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), null);
             }
         }
 
         public void ErrorFormat(Exception exception, String format, params Object[] args) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), exception);
             }
         }
 
         public void ErrorFormat(IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, new SystemStringFormat(formatProvider, format, args), null);
             }
         }
 
         public void ErrorFormat(Exception exception, IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsErrorEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Error, new SystemStringFormat(formatProvider, format, args), exception);
             }
         }
 
         public void Fatal(String message) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, message, null);
             }
         }
 
         public void Fatal(Func<string> messageFactory) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, messageFactory.Invoke(), null);
             }
         }
 
         public void Fatal(String message, Exception exception) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, message, exception);
             }
         }
 
         public void FatalFormat(String format, params Object[] args) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), null);
             }
         }
 
         public void FatalFormat(Exception exception, String format, params Object[] args) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), exception);
             }
         }
 
         public void FatalFormat(IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, new SystemStringFormat(formatProvider, format, args), null);
             }
         }
 
         public void FatalFormat(Exception exception, IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsFatalEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Fatal, new SystemStringFormat(formatProvider, format, args), exception);
             }
         }
 
         public void Info(String message) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, message, null);
             }
         }
 
         public void Info(Func<string> messageFactory) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, messageFactory.Invoke(), null);
             }
         }
 
         public void Info(String message, Exception exception) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, message, exception);
             }
         }
 
         public void InfoFormat(String format, params Object[] args) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), null);
             }
         }
 
         public void InfoFormat(Exception exception, String format, params Object[] args) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), exception);
             }
         }
 
         public void InfoFormat(IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, new SystemStringFormat(formatProvider, format, args), null);
             }
         }
 
         public void InfoFormat(Exception exception, IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsInfoEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Info, new SystemStringFormat(formatProvider, format, args), exception);
             }
         }
 
         public void Warn(String message) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, message, null);
             }
         }
 
         public void Warn(Func<string> messageFactory) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, messageFactory.Invoke(), null);
             }
         }
 
         public void Warn(String message, Exception exception) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, message, exception);
             }
         }
 
         public void WarnFormat(String format, params Object[] args) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), null);
             }
         }
 
         public void WarnFormat(Exception exception, String format, params Object[] args) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, new SystemStringFormat(CultureInfo.InvariantCulture, format, args), exception);
             }
         }
 
         public void WarnFormat(IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, new SystemStringFormat(formatProvider, format, args), null);
             }
         }
 
         public void WarnFormat(Exception exception, IFormatProvider formatProvider, String format, params Object[] args) {
             if (IsWarnEnabled) {
+                AddExtendedThreadInfo();
                 Logger.Log(declaringType, Level.Warn, new SystemStringFormat(formatProvider, format, args), exception);
             }
         }

From 30c43ad130dc09dd62563470fb8c0aa11e5dae4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Thierry=20K=C3=A9chichian?=
 <jean-thierry.kechichian@wanadoo.fr>
Date: Sat, 7 Dec 2013 11:37:22 +0100
Subject: [PATCH 08/21] #20318: Fixing Custom Forms submission.

Work Item: 20318
---
 .../Orchard.CustomForms/Controllers/ItemController.cs      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
index 4ff8a67cb..2cbc4d976 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
@@ -118,13 +118,15 @@ namespace Orchard.CustomForms.Controllers {
             }
 
             var customForm = form.As<CustomFormPart>();
-
             var contentItem = _contentManager.New(customForm.ContentType);
 
             if (!Services.Authorizer.Authorize(Permissions.CreateSubmitPermission(customForm.ContentType), contentItem, T("Couldn't create content")))
                 return new HttpUnauthorizedResult();
 
-            dynamic model = _contentManager.UpdateEditor(contentItem, this);
+            if(customForm.SaveContentItem)
+                _contentManager.Create(contentItem, VersionOptions.Draft);
+
+            var model = _contentManager.UpdateEditor(contentItem, this);
             
             if (!ModelState.IsValid) {
                 _transactionManager.Cancel();
@@ -163,7 +165,6 @@ namespace Orchard.CustomForms.Controllers {
 
             // save the submitted form
             if (customForm.SaveContentItem) {
-                _contentManager.Create(contentItem);
                 conditionallyPublish(contentItem);
             }
 

From e99bba1669b94e1904fe635cb605dfadf0d0cb5d Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Fri, 13 Dec 2013 16:22:13 -0800
Subject: [PATCH 09/21] #20355: Preventing collisions with default tenant

Work Item: 20355
---
 .../Providers/FormsAuthenticationService.cs   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/Security/Providers/FormsAuthenticationService.cs b/src/Orchard/Security/Providers/FormsAuthenticationService.cs
index 50afd4a12..f1e9e8b30 100644
--- a/src/Orchard/Security/Providers/FormsAuthenticationService.cs
+++ b/src/Orchard/Security/Providers/FormsAuthenticationService.cs
@@ -33,7 +33,9 @@ namespace Orchard.Security.Providers {
 
         public void SignIn(IUser user, bool createPersistentCookie) {
             var now = _clock.UtcNow.ToLocalTime();
-            var userData = Convert.ToString(user.Id);
+            
+            // the cookie user data is {userId};{tenant}
+            var userData = String.Concat(Convert.ToString(user.Id), ";", _settings.Name); 
 
             var ticket = new FormsAuthenticationTicket(
                 1 /*version*/,
@@ -99,9 +101,24 @@ namespace Orchard.Security.Providers {
             }
 
             var formsIdentity = (FormsIdentity)httpContext.User.Identity;
-            var userData = formsIdentity.Ticket.UserData;
+            var userData = formsIdentity.Ticket.UserData ?? "";
+
+            // the cookie user data is {userId};{tenant}
+            var userDataSegments = userData.Split(';');
+            
+            if (userDataSegments.Length != 2) {
+                return null;
+            }
+
+            var userDataId = userDataSegments[0];
+            var userDataTenant = userDataSegments[1];
+
+            if (!String.Equals(userDataTenant, _settings.Name, StringComparison.Ordinal)) {
+                return null;
+            }
+
             int userId;
-            if (!int.TryParse(userData, out userId)) {
+            if (!int.TryParse(userDataId, out userId)) {
                 Logger.Fatal("User id not a parsable integer");
                 return null;
             }

From e19360382252f0de35634042b995695d6af55a03 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Fri, 13 Dec 2013 16:49:31 -0800
Subject: [PATCH 10/21] Cleaning tenants cookie on logout

In order to prevent the redirection to re-authenticate
the user automatically.
---
 .../Providers/FormsAuthenticationService.cs   | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/Orchard/Security/Providers/FormsAuthenticationService.cs b/src/Orchard/Security/Providers/FormsAuthenticationService.cs
index f1e9e8b30..ef4b7dd69 100644
--- a/src/Orchard/Security/Providers/FormsAuthenticationService.cs
+++ b/src/Orchard/Security/Providers/FormsAuthenticationService.cs
@@ -57,13 +57,7 @@ namespace Orchard.Security.Providers {
             var httpContext = _httpContextAccessor.Current();
 
             if (!String.IsNullOrEmpty(_settings.RequestUrlPrefix)) {
-                var cookiePath = httpContext.Request.ApplicationPath;
-                if (cookiePath != null && cookiePath.Length > 1) {
-                    cookiePath += '/';
-                }
-
-                cookiePath += _settings.RequestUrlPrefix;
-                cookie.Path = cookiePath;
+                cookie.Path = GetCookiePath(httpContext);
             }
 
             if (FormsAuthentication.CookieDomain != null) {
@@ -84,6 +78,18 @@ namespace Orchard.Security.Providers {
             _signedInUser = null;
             _isAuthenticated = false;
             FormsAuthentication.SignOut();
+
+            // overwritting the authentication cookie for the given tenant
+            var httpContext = _httpContextAccessor.Current();
+            var rFormsCookie = new HttpCookie(FormsAuthentication.FormsCookieName, "") {
+                Expires = DateTime.Now.AddYears(-1),
+            };
+
+            if (!String.IsNullOrEmpty(_settings.RequestUrlPrefix)) {
+                rFormsCookie.Path = GetCookiePath(httpContext);
+            }
+
+            httpContext.Response.Cookies.Add(rFormsCookie);
         }
 
         public void SetAuthenticatedUserForRequest(IUser user) {
@@ -126,5 +132,16 @@ namespace Orchard.Security.Providers {
             _isAuthenticated = true;
             return _signedInUser = _contentManager.Get(userId).As<IUser>();
         }
+
+        private string GetCookiePath(HttpContextBase httpContext) {
+            var cookiePath = httpContext.Request.ApplicationPath;
+            if (cookiePath != null && cookiePath.Length > 1) {
+                cookiePath += '/';
+            }
+
+            cookiePath += _settings.RequestUrlPrefix;
+
+            return cookiePath;
+        }
     }
 }

From 2b793ad2b0477221090501f3da5ddab242b89cfa Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel.stolt@perceptible.net>
Date: Tue, 17 Dec 2013 16:20:09 +0100
Subject: [PATCH 11/21] #20360: Adding Orchard.SecureSocketsLayer to Azure
 solution and adding a reference to it from Orchard.Azure.Web.

Work Item: 20360
---
 .../Orchard.Azure.Web/Orchard.Azure.Web.csproj        |  4 ++++
 src/Orchard.Azure/Orchard.Azure.sln                   | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 6319deb0b..14caf5959 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -428,6 +428,10 @@
       <Name>Orchard.Search</Name>
       <Private>True</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.SecureSocketsLayer\Orchard.SecureSocketsLayer.csproj">
+      <Project>{36b82383-d69e-4897-a24a-648babdf80ec}</Project>
+      <Name>Orchard.SecureSocketsLayer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Setup\Orchard.Setup.csproj">
       <Project>{8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4}</Project>
       <Name>Orchard.Setup</Name>
diff --git a/src/Orchard.Azure/Orchard.Azure.sln b/src/Orchard.Azure/Orchard.Azure.sln
index 3c4bfc8eb..2fa074071 100644
--- a/src/Orchard.Azure/Orchard.Azure.sln
+++ b/src/Orchard.Azure/Orchard.Azure.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{75E7476C-C05B-4C41-8E38-081D3EB55659}"
@@ -137,6 +139,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules.Deprecated", "Modul
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orchard", "Orchard", "{F2AB7512-139A-420F-AE3A-9ED22CA52CE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.SecureSocketsLayer", "..\Orchard.Web\Modules\Orchard.SecureSocketsLayer\Orchard.SecureSocketsLayer.csproj", "{36B82383-D69E-4897-A24A-648BABDF80EC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -395,6 +399,10 @@ Global
 		{CBC7993C-57D8-4A6C-992C-19E849DFE71D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CBC7993C-57D8-4A6C-992C-19E849DFE71D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBC7993C-57D8-4A6C-992C-19E849DFE71D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36B82383-D69E-4897-A24A-648BABDF80EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36B82383-D69E-4897-A24A-648BABDF80EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B82383-D69E-4897-A24A-648BABDF80EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36B82383-D69E-4897-A24A-648BABDF80EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -452,6 +460,7 @@ Global
 		{8A9FDB57-342D-49C2-BAFC-D885AAE5CC7C} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{5D13EF34-8B39-4EC5-847F-E12892ACF841} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{E649EA64-D213-461B-87F7-D67035801443} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
+		{36B82383-D69E-4897-A24A-648BABDF80EC} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{33B1BC8D-E292-4972-A363-22056B207156} = {75E7476C-C05B-4C41-8E38-081D3EB55659}
 		{CB70A642-8CEC-4DDE-8C9F-AD08900EC98D} = {84650275-884D-4CBB-9CC0-67553996E211}
 		{9916839C-39FC-4CEB-A5AF-89CA7E87119F} = {F2AB7512-139A-420F-AE3A-9ED22CA52CE1}

From 9a07d8b4198971958ffe9b427a93dde8b29bec75 Mon Sep 17 00:00:00 2001
From: Lombiq <registrator@lombiq.com>
Date: Fri, 27 Dec 2013 01:27:04 +0100
Subject: [PATCH 12/21] Adding some inline documentation to shell management
 API

---
 .../Services/ITenantService.cs                   | 16 +++++++++++++++-
 .../Configuration/IShellSettingsManager.cs       |  9 +++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/ITenantService.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/ITenantService.cs
index 4cf4844f0..6db707ac1 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/ITenantService.cs
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/ITenantService.cs
@@ -4,12 +4,26 @@ using Orchard.Environment.Extensions.Models;
 
 namespace Orchard.MultiTenancy.Services {
     public interface ITenantService : IDependency {
+        /// <summary>
+        /// Retrieves all tenants' shell settings.
+        /// </summary>
+        /// <returns>All tenants' shell settings.</returns>
         IEnumerable<ShellSettings> GetTenants();
+
+        /// <summary>
+        /// Creates a new tenant.
+        /// </summary>
+        /// <param name="settings">Shell settings of the tenant.</param>
         void CreateTenant(ShellSettings settings);
+
+        /// <summary>
+        /// Updates the shell settings of a tenant.
+        /// </summary>
+        /// <param name="settings">Shell settings of the tenant.</param>
         void UpdateTenant(ShellSettings settings);
 
         /// <summary>
-        /// Returns a list of all installed themes
+        /// Returns a list of all installed themes.
         /// </summary>
         IEnumerable<ExtensionDescriptor> GetInstalledThemes();
     }
diff --git a/src/Orchard/Environment/Configuration/IShellSettingsManager.cs b/src/Orchard/Environment/Configuration/IShellSettingsManager.cs
index d58eedade..60cb62fb3 100644
--- a/src/Orchard/Environment/Configuration/IShellSettingsManager.cs
+++ b/src/Orchard/Environment/Configuration/IShellSettingsManager.cs
@@ -2,7 +2,16 @@ using System.Collections.Generic;
 
 namespace Orchard.Environment.Configuration {
     public interface IShellSettingsManager {
+        /// <summary>
+        /// Retrieves all shell settings stored.
+        /// </summary>
+        /// <returns>All shell settings.</returns>
         IEnumerable<ShellSettings> LoadSettings();
+
+        /// <summary>
+        /// Persists shell settings to the storage.
+        /// </summary>
+        /// <param name="settings">The shell settings to store.</param>
         void SaveSettings(ShellSettings settings);
     }
 }
\ No newline at end of file

From 87ccd59dc09414c80413869e49ddf43d5271a9ac Mon Sep 17 00:00:00 2001
From: Bertrand Le Roy <bertrandleroy@gmail.com>
Date: Sun, 5 Jan 2014 16:11:33 -0800
Subject: [PATCH 13/21] SSL transitions from https to http should not be forced
 on Ajax requests, as they can result in mixed security, and cross-domain
 failures.

---
 .../Filters/SecureSocketsLayersFilter.cs                       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs
index 01fd90de8..2d760b52c 100644
--- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs
@@ -53,7 +53,8 @@ namespace Orchard.SecureSocketsLayer.Filters {
 
             // non auth page on a secure canal
             // nb: needed as the ReturnUrl for LogOn doesn't force the scheme to http, and reuses the current one
-            if (!secure && request.IsSecureConnection) {
+            // Also don't force http on ajax requests.
+            if (!secure && request.IsSecureConnection && !request.IsAjaxRequest()) {
                 var insecureActionUrl = AppendQueryString(
                     request.QueryString,
                     _sslService.InsecureActionUrl(

From 068691af1194b0b98d7a74ce381820a8ae32ec1b Mon Sep 17 00:00:00 2001
From: Piotr Szmyd <piotr.szmyd@ieee.org>
Date: Mon, 6 Jan 2014 19:12:44 +0100
Subject: [PATCH 14/21] #20403: Custom forms performance fix. Form types should
 be fetched from available type definitions, not by scanning all content
 items.

Work Item: 20403
---
 .../Modules/Orchard.CustomForms/Permissions.cs   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Permissions.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Permissions.cs
index fe9173268..4beb03f16 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Permissions.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Permissions.cs
@@ -15,25 +15,19 @@ namespace Orchard.CustomForms {
         public static readonly Permission ManageForms = new Permission { Description = "Manage custom forms", Name = "ManageForms" };
 
         private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
         
         public virtual Feature Feature { get; set; }
 
-        public Permissions(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) {
+        public Permissions(IContentDefinitionManager contentDefinitionManager) {
             _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
         }
 
         public IEnumerable<Permission> GetPermissions() {
-            // manage rights only for Creatable types
-            var formTypes = _contentManager.Query<CustomFormPart>().List().Select(x => x.ContentType).Distinct();
-            
-            foreach (var contentType in formTypes) {
-                var typeDefinition = _contentDefinitionManager.GetTypeDefinition(contentType);
-                if(typeDefinition == null) {
-                    continue;
-                }
+            var formTypeDefinitions = _contentDefinitionManager
+                .ListTypeDefinitions()
+                .Where(x => x.Parts.Any(xx => xx.PartDefinition.Name == typeof(CustomFormPart).Name));
 
+            foreach (var typeDefinition in formTypeDefinitions) {
                 yield return CreateSubmitPermission(typeDefinition);
             }
 

From d5b68e2c9ad5705a21e3a50a6bba8563f26176bd Mon Sep 17 00:00:00 2001
From: Lombiq <registrator@lombiq.com>
Date: Wed, 15 Jan 2014 22:40:22 +0100
Subject: [PATCH 15/21] #20420: Fixing Internal server error on the Azure
 Storage emulator when multiple concurrent requests try to access Blob
 storage.

Work Item: 20420
---
 .../Services/FileSystems/AzureFileSystem.cs            | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
index 170346e64..fbff62f98 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
@@ -67,15 +67,7 @@ namespace Orchard.Azure.Services.FileSystems {
             // The container is named with DNS naming restrictions (i.e. all lower case)
             _container = _blobClient.GetContainerReference(ContainerName);
 
-            _container.CreateIfNotExists();
-
-            _container.SetPermissions(_isPrivate
-                                            ? new BlobContainerPermissions {
-                                                PublicAccess = BlobContainerPublicAccessType.Off
-                                            }
-                                            : new BlobContainerPermissions {
-                                                PublicAccess = BlobContainerPublicAccessType.Container
-                                            });
+            _container.CreateIfNotExists(_isPrivate ? BlobContainerPublicAccessType.Off : BlobContainerPublicAccessType.Container);
         }
 
         private static string ConvertToRelativeUriPath(string path) {

From 529a43c1ed60efca512690bece452888ddb30f9a Mon Sep 17 00:00:00 2001
From: Bertrand Le Roy <bertrandleroy@gmail.com>
Date: Sat, 18 Jan 2014 18:36:11 -0800
Subject: [PATCH 16/21] Added a part setting for TermPart so the display type
 can be changed on child items when displaying the details of the term.

---
 .../Drivers/TermPartDriver.cs                 | 272 +++++-----
 .../Orchard.Taxonomies.csproj                 | 476 +++++++++---------
 .../Settings/TermPartEditorEvents.cs          |  32 ++
 .../Settings/TermPartSettings.cs              |   8 +
 .../TermPartSettings.cshtml                   |   7 +
 5 files changed, 426 insertions(+), 369 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs
 create mode 100644 src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs
 create mode 100644 src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml

diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
index cab6831d7..1f57334c7 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
@@ -1,137 +1,143 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Routing;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Drivers;
-using Orchard.Taxonomies.Models;
-using Orchard.Taxonomies.Services;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Core.Feeds;
-using Orchard.Localization;
-using Orchard.Mvc;
-using Orchard.Settings;
-using Orchard.UI.Navigation;
-
-namespace Orchard.Taxonomies.Drivers {
-    public class TermPartDriver : ContentPartDriver<TermPart> {
-        private readonly ITaxonomyService _taxonomyService;
-        private readonly ISiteService _siteService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IFeedManager _feedManager;
-        private readonly IContentManager _contentManager;
-
-        public TermPartDriver(
-            ITaxonomyService taxonomyService,
-            ISiteService siteService,
-            IHttpContextAccessor httpContextAccessor,
-            IFeedManager feedManager,
-            IContentManager contentManager) {
-            _taxonomyService = taxonomyService;
-            _siteService = siteService;
-            _httpContextAccessor = httpContextAccessor;
-            _feedManager = feedManager;
-            _contentManager = contentManager;
-            T = NullLocalizer.Instance;
-        }
-
-        public Localizer T { get; set; }
-        protected override string Prefix { get { return "Term"; } }
-
-        protected override DriverResult Display(TermPart part, string displayType, dynamic shapeHelper) {
-            return Combined(
-                ContentShape("Parts_TermPart_Feed", () => {
-                    
-                    // generates a link to the RSS feed for this term
-                    _feedManager.Register(part.Name, "rss", new RouteValueDictionary { { "term", part.Id } });
-                    return null;
-                }),
-                ContentShape("Parts_TermPart", () => {
-                    var pagerParameters = new PagerParameters();
-                    var httpContext = _httpContextAccessor.Current();
-                    if (httpContext != null) {
-                        pagerParameters.Page = Convert.ToInt32(httpContext.Request.QueryString["page"]);
-                    }
-                    
-                    var pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
-                    var taxonomy = _taxonomyService.GetTaxonomy(part.TaxonomyId);
-                    var totalItemCount = _taxonomyService.GetContentItemsCount(part);
-
-                    // asign Taxonomy and Term to the content item shape (Content) in order to provide 
-                    // alternates when those content items are displayed when they are listed on a term
-                    var termContentItems = _taxonomyService.GetContentItems(part, pager.GetStartIndex(), pager.PageSize)
-                        .Select(c => _contentManager.BuildDisplay(c, "Summary").Taxonomy(taxonomy).Term(part));
-
-                    var list = shapeHelper.List();
-
-                    list.AddRange(termContentItems);
-
-                    var pagerShape = shapeHelper.Pager(pager)
-                            .TotalItemCount(totalItemCount)
-                            .Taxonomy(taxonomy)
-                            .Term(part);
-
-                    return shapeHelper.Parts_TermPart(ContentItems: list, Taxonomy: taxonomy, Pager: pagerShape);
-                }));
-        }
-
-        protected override DriverResult Editor(TermPart part, dynamic shapeHelper) {
-            return ContentShape("Parts_Taxonomies_Term_Fields",
-                    () => shapeHelper.EditorTemplate(TemplateName: "Parts/Taxonomies.Term.Fields", Model: part, Prefix: Prefix));
-        }
-
-        protected override DriverResult Editor(TermPart termPart, IUpdateModel updater, dynamic shapeHelper) {
-            if (updater.TryUpdateModel(termPart, Prefix, null, null)) {
-                var existing = _taxonomyService.GetTermByName(termPart.TaxonomyId, termPart.Name);
-                if (existing != null && existing.Record != termPart.Record && existing.Container.ContentItem.Record == termPart.Container.ContentItem.Record) {
-                    updater.AddModelError("Name", T("The term {0} already exists at this level", termPart.Name));
-                }
-            }
-
-            return Editor(termPart, shapeHelper);
-        }
-
-        protected override void Exporting(TermPart part, ExportContentContext context) {
-            context.Element(part.PartDefinition.Name).SetAttributeValue("Count", part.Record.Count);
-            context.Element(part.PartDefinition.Name).SetAttributeValue("Selectable", part.Record.Selectable);
-            context.Element(part.PartDefinition.Name).SetAttributeValue("Weight", part.Record.Weight);
-
-            var taxonomy = _contentManager.Get(part.Record.TaxonomyId);
-            var identity = _contentManager.GetItemMetadata(taxonomy).Identity.ToString();
-            context.Element(part.PartDefinition.Name).SetAttributeValue("TaxonomyId", identity);
-
-            var identityPaths = new List<string>();
-            foreach(var pathPart in part.Record.Path.Split('/')) {
-                if(String.IsNullOrEmpty(pathPart)) {
-                    continue;
-                }
-
-                var parent = _contentManager.Get(Int32.Parse(pathPart));
-                identityPaths.Add(_contentManager.GetItemMetadata(parent).Identity.ToString());
-            }
-
-            context.Element(part.PartDefinition.Name).SetAttributeValue("Path", String.Join(",", identityPaths.ToArray()));
-        }
-
-        protected override void Importing(TermPart part, ImportContentContext context) {
-            part.Record.Count = Int32.Parse(context.Attribute(part.PartDefinition.Name, "Count"));
-            part.Record.Selectable = Boolean.Parse(context.Attribute(part.PartDefinition.Name, "Selectable"));
-            part.Record.Weight = Int32.Parse(context.Attribute(part.PartDefinition.Name, "Weight"));
-
-            var identity = context.Attribute(part.PartDefinition.Name, "TaxonomyId");
-            var contentItem = context.GetItemFromSession(identity);
-            
-            if (contentItem == null) {
-                throw new OrchardException(T("Unknown taxonomy: {0}", identity));
-            } 
-            
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Routing;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Drivers;
+using Orchard.Taxonomies.Models;
+using Orchard.Taxonomies.Services;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Core.Feeds;
+using Orchard.Localization;
+using Orchard.Mvc;
+using Orchard.Settings;
+using Orchard.Taxonomies.Settings;
+using Orchard.UI.Navigation;
+
+namespace Orchard.Taxonomies.Drivers {
+    public class TermPartDriver : ContentPartDriver<TermPart> {
+        private readonly ITaxonomyService _taxonomyService;
+        private readonly ISiteService _siteService;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IFeedManager _feedManager;
+        private readonly IContentManager _contentManager;
+
+        public TermPartDriver(
+            ITaxonomyService taxonomyService,
+            ISiteService siteService,
+            IHttpContextAccessor httpContextAccessor,
+            IFeedManager feedManager,
+            IContentManager contentManager) {
+            _taxonomyService = taxonomyService;
+            _siteService = siteService;
+            _httpContextAccessor = httpContextAccessor;
+            _feedManager = feedManager;
+            _contentManager = contentManager;
+            T = NullLocalizer.Instance;
+        }
+
+        public Localizer T { get; set; }
+        protected override string Prefix { get { return "Term"; } }
+
+        protected override DriverResult Display(TermPart part, string displayType, dynamic shapeHelper) {
+            return Combined(
+                ContentShape("Parts_TermPart_Feed", () => {
+                    
+                    // generates a link to the RSS feed for this term
+                    _feedManager.Register(part.Name, "rss", new RouteValueDictionary { { "term", part.Id } });
+                    return null;
+                }),
+                ContentShape("Parts_TermPart", () => {
+                    var pagerParameters = new PagerParameters();
+                    var httpContext = _httpContextAccessor.Current();
+                    if (httpContext != null) {
+                        pagerParameters.Page = Convert.ToInt32(httpContext.Request.QueryString["page"]);
+                    }
+                    
+                    var pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+                    var taxonomy = _taxonomyService.GetTaxonomy(part.TaxonomyId);
+                    var totalItemCount = _taxonomyService.GetContentItemsCount(part);
+
+                    var partSettings = part.Settings.GetModel<TermPartSettings>();
+                    var childDisplayType = partSettings != null &&
+                                           !String.IsNullOrWhiteSpace(partSettings.ChildDisplayType)
+                        ? partSettings.ChildDisplayType
+                        : "Summary";
+                    // asign Taxonomy and Term to the content item shape (Content) in order to provide 
+                    // alternates when those content items are displayed when they are listed on a term
+                    var termContentItems = _taxonomyService.GetContentItems(part, pager.GetStartIndex(), pager.PageSize)
+                        .Select(c => _contentManager.BuildDisplay(c, childDisplayType).Taxonomy(taxonomy).Term(part));
+
+                    var list = shapeHelper.List();
+
+                    list.AddRange(termContentItems);
+
+                    var pagerShape = shapeHelper.Pager(pager)
+                            .TotalItemCount(totalItemCount)
+                            .Taxonomy(taxonomy)
+                            .Term(part);
+
+                    return shapeHelper.Parts_TermPart(ContentItems: list, Taxonomy: taxonomy, Pager: pagerShape);
+                }));
+        }
+
+        protected override DriverResult Editor(TermPart part, dynamic shapeHelper) {
+            return ContentShape("Parts_Taxonomies_Term_Fields",
+                    () => shapeHelper.EditorTemplate(TemplateName: "Parts/Taxonomies.Term.Fields", Model: part, Prefix: Prefix));
+        }
+
+        protected override DriverResult Editor(TermPart termPart, IUpdateModel updater, dynamic shapeHelper) {
+            if (updater.TryUpdateModel(termPart, Prefix, null, null)) {
+                var existing = _taxonomyService.GetTermByName(termPart.TaxonomyId, termPart.Name);
+                if (existing != null && existing.Record != termPart.Record && existing.Container.ContentItem.Record == termPart.Container.ContentItem.Record) {
+                    updater.AddModelError("Name", T("The term {0} already exists at this level", termPart.Name));
+                }
+            }
+
+            return Editor(termPart, shapeHelper);
+        }
+
+        protected override void Exporting(TermPart part, ExportContentContext context) {
+            context.Element(part.PartDefinition.Name).SetAttributeValue("Count", part.Record.Count);
+            context.Element(part.PartDefinition.Name).SetAttributeValue("Selectable", part.Record.Selectable);
+            context.Element(part.PartDefinition.Name).SetAttributeValue("Weight", part.Record.Weight);
+
+            var taxonomy = _contentManager.Get(part.Record.TaxonomyId);
+            var identity = _contentManager.GetItemMetadata(taxonomy).Identity.ToString();
+            context.Element(part.PartDefinition.Name).SetAttributeValue("TaxonomyId", identity);
+
+            var identityPaths = new List<string>();
+            foreach(var pathPart in part.Record.Path.Split('/')) {
+                if(String.IsNullOrEmpty(pathPart)) {
+                    continue;
+                }
+
+                var parent = _contentManager.Get(Int32.Parse(pathPart));
+                identityPaths.Add(_contentManager.GetItemMetadata(parent).Identity.ToString());
+            }
+
+            context.Element(part.PartDefinition.Name).SetAttributeValue("Path", String.Join(",", identityPaths.ToArray()));
+        }
+
+        protected override void Importing(TermPart part, ImportContentContext context) {
+            part.Record.Count = Int32.Parse(context.Attribute(part.PartDefinition.Name, "Count"));
+            part.Record.Selectable = Boolean.Parse(context.Attribute(part.PartDefinition.Name, "Selectable"));
+            part.Record.Weight = Int32.Parse(context.Attribute(part.PartDefinition.Name, "Weight"));
+
+            var identity = context.Attribute(part.PartDefinition.Name, "TaxonomyId");
+            var contentItem = context.GetItemFromSession(identity);
+            
+            if (contentItem == null) {
+                throw new OrchardException(T("Unknown taxonomy: {0}", identity));
+            } 
+            
             part.Record.TaxonomyId = contentItem.Id;
             part.Record.Path = "/";
-
-            foreach(var identityPath in context.Attribute(part.PartDefinition.Name, "Path").Split(new [] {','}, StringSplitOptions.RemoveEmptyEntries)) {
-                var pathContentItem = context.GetItemFromSession(identityPath);
+
+            foreach(var identityPath in context.Attribute(part.PartDefinition.Name, "Path").Split(new [] {','}, StringSplitOptions.RemoveEmptyEntries)) {
+                var pathContentItem = context.GetItemFromSession(identityPath);
                 part.Record.Path += pathContentItem.Id + "/";
-            }
-        }
-    }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
index b4a017dc1..11a06cdcd 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
@@ -1,240 +1,244 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E649EA64-D213-461B-87F7-D67035801443}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Taxonomies</RootNamespace>
-    <AssemblyName>Orchard.Taxonomies</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>false</UseIISExpress>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Controllers\TermAdminController.cs" />
-    <Compile Include="Drivers\TaxonomyNavigationPartDriver.cs" />
-    <Compile Include="Drivers\TermsPartDriver.cs" />
-    <Compile Include="Drivers\TaxonomyPartDriver.cs" />
-    <Compile Include="Handlers\TaxonomyPartHandler.cs" />
-    <Compile Include="Handlers\TermsPartHandler.cs" />
-    <Compile Include="Helpers\PathExtensions.cs" />
-    <Compile Include="Migrations.cs" />
-    <Compile Include="Drivers\TermPartDriver.cs" />
-    <Compile Include="Drivers\TaxonomyFieldDriver.cs" />
-    <Compile Include="Handlers\TermPartHandler.cs" />
-    <Compile Include="Helpers\PredicateBuilder.cs" />
-    <Compile Include="Models\TaxonomyNavigationPart.cs" />
-    <Compile Include="Models\TermContentItemPart.cs" />
-    <Compile Include="Models\TaxonomyPartRecord.cs" />
-    <Compile Include="Models\TermPart.cs" />
-    <Compile Include="Models\TermPartNode.cs" />
-    <Compile Include="Models\TermPartRecord.cs" />
-    <Compile Include="Models\TaxonomyPart.cs" />
-    <Compile Include="Models\TermContentItem.cs" />
-    <Compile Include="Models\TermsPart.cs" />
-    <Compile Include="Models\TermsPartRecord.cs" />
-    <Compile Include="Navigation\TaxonomyNavigationProvider.cs" />
-    <Compile Include="Permissions.cs" />
-    <Compile Include="Projections\TermsFilter.cs" />
-    <Compile Include="Projections\TermsFilterForms.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Fields\TaxonomyField.cs" />
-    <Compile Include="Services\ITaxonomyService.cs" />
-    <Compile Include="Services\TaxonomyService.cs" />
-    <Compile Include="Settings\TaxonomyFieldEditorEvents.cs" />
-    <Compile Include="Settings\TaxonomyFieldSettings.cs" />
-    <Compile Include="Shapes.cs" />
-    <Compile Include="StandardQueries\TermFeedQuery.cs" />
-    <Compile Include="Tokens\TaxonomyTokens.cs" />
-    <Compile Include="ViewModels\ImportViewModel.cs" />
-    <Compile Include="ViewModels\MergeTermViewModel.cs" />
-    <Compile Include="ViewModels\MoveTermViewModel.cs" />
-    <Compile Include="ViewModels\SelectTermViewModel.cs" />
-    <Compile Include="ViewModels\TaxonomyFieldViewModel.cs" />
-    <Compile Include="ViewModels\TermAdminIndexViewModel.cs" />
-    <Compile Include="ViewModels\TaxonomyAdminIndexViewModel.cs" />
-    <Compile Include="ViewModels\TaxonomyNavigationViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scripts\admin-taxonomy-expando.js" />
-    <Content Include="Scripts\admin-taxonomy-field-settings.js" />
-    <Content Include="Scripts\admin-taxonomy-tags.js" />
-    <Content Include="Scripts\tagit.js" />
-    <Content Include="Styles\admin-taxonomy-tags.css" />
-    <Content Include="Styles\images\menu.taxonomies.png" />
-    <Content Include="Styles\menu.taxonomies-admin.css" />
-    <Content Include="Styles\ui-anim_basic_16x16.gif" />
-    <Content Include="Views\Admin\Import.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Styles\admin-taxonomy.css" />
-    <Content Include="Module.txt" />
-    <Content Include="Views\Admin\Edit.cshtml" />
-    <Content Include="Views\Admin\Create.cshtml" />
-    <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\DefinitionTemplates\TaxonomyFieldSettings.cshtml" />
-    <Content Include="Views\Fields\TaxonomyField.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Taxonomies.Term.Fields.cshtml" />
-    <Content Include="Views\Items\Content-Term.Edit.cshtml" />
-    <Content Include="Views\TermAdmin\Create.cshtml" />
-    <Content Include="Views\TermAdmin\Edit.cshtml" />
-    <Content Include="Views\TermAdmin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E649EA64-D213-461B-87F7-D67035801443}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.Taxonomies</RootNamespace>
+    <AssemblyName>Orchard.Taxonomies</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <UseIISExpress>false</UseIISExpress>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Controllers\TermAdminController.cs" />
+    <Compile Include="Drivers\TaxonomyNavigationPartDriver.cs" />
+    <Compile Include="Drivers\TermsPartDriver.cs" />
+    <Compile Include="Drivers\TaxonomyPartDriver.cs" />
+    <Compile Include="Handlers\TaxonomyPartHandler.cs" />
+    <Compile Include="Handlers\TermsPartHandler.cs" />
+    <Compile Include="Helpers\PathExtensions.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Drivers\TermPartDriver.cs" />
+    <Compile Include="Drivers\TaxonomyFieldDriver.cs" />
+    <Compile Include="Handlers\TermPartHandler.cs" />
+    <Compile Include="Helpers\PredicateBuilder.cs" />
+    <Compile Include="Models\TaxonomyNavigationPart.cs" />
+    <Compile Include="Models\TermContentItemPart.cs" />
+    <Compile Include="Models\TaxonomyPartRecord.cs" />
+    <Compile Include="Models\TermPart.cs" />
+    <Compile Include="Models\TermPartNode.cs" />
+    <Compile Include="Models\TermPartRecord.cs" />
+    <Compile Include="Models\TaxonomyPart.cs" />
+    <Compile Include="Models\TermContentItem.cs" />
+    <Compile Include="Models\TermsPart.cs" />
+    <Compile Include="Models\TermsPartRecord.cs" />
+    <Compile Include="Navigation\TaxonomyNavigationProvider.cs" />
+    <Compile Include="Permissions.cs" />
+    <Compile Include="Projections\TermsFilter.cs" />
+    <Compile Include="Projections\TermsFilterForms.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Fields\TaxonomyField.cs" />
+    <Compile Include="Services\ITaxonomyService.cs" />
+    <Compile Include="Services\TaxonomyService.cs" />
+    <Compile Include="Settings\TermPartEditorEvents.cs" />
+    <Compile Include="Settings\TaxonomyFieldEditorEvents.cs" />
+    <Compile Include="Settings\TermPartSettings.cs" />
+    <Compile Include="Settings\TaxonomyFieldSettings.cs" />
+    <Compile Include="Shapes.cs" />
+    <Compile Include="StandardQueries\TermFeedQuery.cs" />
+    <Compile Include="Tokens\TaxonomyTokens.cs" />
+    <Compile Include="ViewModels\ImportViewModel.cs" />
+    <Compile Include="ViewModels\MergeTermViewModel.cs" />
+    <Compile Include="ViewModels\MoveTermViewModel.cs" />
+    <Compile Include="ViewModels\SelectTermViewModel.cs" />
+    <Compile Include="ViewModels\TaxonomyFieldViewModel.cs" />
+    <Compile Include="ViewModels\TermAdminIndexViewModel.cs" />
+    <Compile Include="ViewModels\TaxonomyAdminIndexViewModel.cs" />
+    <Compile Include="ViewModels\TaxonomyNavigationViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\admin-taxonomy-expando.js" />
+    <Content Include="Scripts\admin-taxonomy-field-settings.js" />
+    <Content Include="Scripts\admin-taxonomy-tags.js" />
+    <Content Include="Scripts\tagit.js" />
+    <Content Include="Styles\admin-taxonomy-tags.css" />
+    <Content Include="Styles\images\menu.taxonomies.png" />
+    <Content Include="Styles\menu.taxonomies-admin.css" />
+    <Content Include="Styles\ui-anim_basic_16x16.gif" />
+    <Content Include="Views\Admin\Import.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\admin-taxonomy.css" />
+    <Content Include="Module.txt" />
+    <Content Include="Views\Admin\Edit.cshtml" />
+    <Content Include="Views\Admin\Create.cshtml" />
+    <Content Include="Views\Admin\Index.cshtml" />
+    <Content Include="Views\DefinitionTemplates\TaxonomyFieldSettings.cshtml" />
+    <Content Include="Views\Fields\TaxonomyField.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts\Taxonomies.Term.Fields.cshtml" />
+    <Content Include="Views\Items\Content-Term.Edit.cshtml" />
+    <Content Include="Views\TermAdmin\Create.cshtml" />
+    <Content Include="Views\TermAdmin\Edit.cshtml" />
+    <Content Include="Views\TermAdmin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Placement.info">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Styles\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Views\TermAdmin\RenderTermSelect.cshtml" />
-    <Content Include="Views\TermAdmin\MoveTerm.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Home\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scripts\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\TermAdmin\SelectTerm.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2d1d92bb-4555-4cbe-8d0e-63563d6ce4c6}</Project>
-      <Name>Orchard.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
-      <Name>Orchard.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Alias\Orchard.Alias.csproj">
-      <Project>{475b6c45-b27c-438b-8966-908b9d6d1077}</Project>
-      <Name>Orchard.Alias</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Autoroute\Orchard.Autoroute.csproj">
-      <Project>{66fccd76-2761-47e3-8d11-b45d0001ddaa}</Project>
-      <Name>Orchard.Autoroute</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
-      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
-      <Name>Orchard.Tokens</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Fields\TaxonomyField.Autocomplete.cshtml" />
-    <Content Include="Views\EditorTemplates\Fields\TaxonomyField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\TermAdmin\Merge.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts.TaxonomyPart.cshtml">
-      <SubType>Code</SubType>
-    </Content>
-    <Content Include="Views\Parts.TermPart.cshtml" />
-    <Content Include="Views\Taxonomy.cshtml" />
-    <Content Include="Views\TaxonomyItem.cshtml" />
-    <Content Include="Views\TaxonomyItemLink.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Parts\Navigation.Taxonomy.Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target> -->
-  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>2078</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+    <Content Include="Placement.info">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Views\TermAdmin\RenderTermSelect.cshtml" />
+    <Content Include="Views\TermAdmin\MoveTerm.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Home\List.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\TermAdmin\SelectTerm.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2d1d92bb-4555-4cbe-8d0e-63563d6ce4c6}</Project>
+      <Name>Orchard.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
+      <Name>Orchard.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Alias\Orchard.Alias.csproj">
+      <Project>{475b6c45-b27c-438b-8966-908b9d6d1077}</Project>
+      <Name>Orchard.Alias</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Autoroute\Orchard.Autoroute.csproj">
+      <Project>{66fccd76-2761-47e3-8d11-b45d0001ddaa}</Project>
+      <Name>Orchard.Autoroute</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
+      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
+      <Name>Orchard.Tokens</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Fields\TaxonomyField.Autocomplete.cshtml" />
+    <Content Include="Views\EditorTemplates\Fields\TaxonomyField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\TermAdmin\Merge.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts.TaxonomyPart.cshtml">
+      <SubType>Code</SubType>
+    </Content>
+    <Content Include="Views\Parts.TermPart.cshtml" />
+    <Content Include="Views\Taxonomy.cshtml" />
+    <Content Include="Views\TaxonomyItem.cshtml" />
+    <Content Include="Views\TaxonomyItemLink.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts\Navigation.Taxonomy.Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\DefinitionTemplates\TermPartSettings.cshtml" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target> -->
+  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>2078</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs
new file mode 100644
index 000000000..b3fdd3801
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.ViewModels;
+
+namespace Orchard.Taxonomies.Settings {
+    public class TermPartEditorEvents : ContentDefinitionEditorEventsBase {
+        public override IEnumerable<TemplateViewModel> TypePartEditor(ContentTypePartDefinition definition) {
+            if (definition.PartDefinition.Name == "TermPart") {
+                var model = definition.Settings.GetModel<TermPartSettings>();
+                yield return DefinitionTemplate(model);
+            }
+        }
+
+        public override IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) {
+            if (builder.Name != "TermPart") {
+                yield break;
+            }
+
+            var model = new TermPartSettings();
+
+            if (updateModel.TryUpdateModel(model, "TermPartSettings", null, null)) {
+                builder
+                    .WithSetting("TermPartSettings.ChildDisplayType", model.ChildDisplayType);
+            }
+
+            yield return DefinitionTemplate(model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs
new file mode 100644
index 000000000..f56d45a6d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs
@@ -0,0 +1,8 @@
+namespace Orchard.Taxonomies.Settings {
+    public class TermPartSettings {
+        /// <summary>
+        /// The display type to use for the child items of the term.
+        /// </summary>
+        public string ChildDisplayType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml
new file mode 100644
index 000000000..85bf95200
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml
@@ -0,0 +1,7 @@
+@model Orchard.Taxonomies.Settings.TermPartSettings
+<fieldset>
+    <label for="@Html.FieldIdFor(m => m.ChildDisplayType)">@T("Child display type")</label>
+    @Html.TextBoxFor(m => m.ChildDisplayType, new { @class = "text medium" })
+    <span class="hint">@T("The display type to apply to child items when displaying the details of this taxonomy term.")</span>
+    @Html.ValidationMessageFor(m => m.ChildDisplayType)
+</fieldset>
\ No newline at end of file

From cc9624c7419ac1091349536898313ffb862da888 Mon Sep 17 00:00:00 2001
From: Bertrand Le Roy <bertrandleroy@gmail.com>
Date: Sat, 18 Jan 2014 19:43:08 -0800
Subject: [PATCH 17/21] Added a part setting for TermPart so the page size can
 be adjusted.

---
 .../Orchard.Taxonomies/Drivers/TermPartDriver.cs   |  8 +++++++-
 .../Settings/TermPartEditorEvents.cs               |  5 ++++-
 .../Settings/TermPartSettings.cs                   | 10 ++++++++++
 .../DefinitionTemplates/TermPartSettings.cshtml    | 14 +++++++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
index 1f57334c7..359afad17 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
@@ -59,6 +59,10 @@ namespace Orchard.Taxonomies.Drivers {
                     var totalItemCount = _taxonomyService.GetContentItemsCount(part);
 
                     var partSettings = part.Settings.GetModel<TermPartSettings>();
+                    if (partSettings != null && partSettings.OverrideDefaultPagination) {
+                        pager.PageSize = partSettings.PageSize;
+                    }
+
                     var childDisplayType = partSettings != null &&
                                            !String.IsNullOrWhiteSpace(partSettings.ChildDisplayType)
                         ? partSettings.ChildDisplayType
@@ -72,7 +76,9 @@ namespace Orchard.Taxonomies.Drivers {
 
                     list.AddRange(termContentItems);
 
-                    var pagerShape = shapeHelper.Pager(pager)
+                    var pagerShape = pager.PageSize == 0
+                        ? null
+                        : shapeHelper.Pager(pager)
                             .TotalItemCount(totalItemCount)
                             .Taxonomy(taxonomy)
                             .Term(part);
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs
index b3fdd3801..5dc08118d 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartEditorEvents.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
@@ -23,7 +24,9 @@ namespace Orchard.Taxonomies.Settings {
 
             if (updateModel.TryUpdateModel(model, "TermPartSettings", null, null)) {
                 builder
-                    .WithSetting("TermPartSettings.ChildDisplayType", model.ChildDisplayType);
+                    .WithSetting("TermPartSettings.ChildDisplayType", model.ChildDisplayType)
+                    .WithSetting("TermPartSettings.OverrideDefaultPagination", model.OverrideDefaultPagination.ToString())
+                    .WithSetting("TermPartSettings.PageSize", model.PageSize.ToString(CultureInfo.InvariantCulture));
             }
 
             yield return DefinitionTemplate(model);
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs
index f56d45a6d..65b91c38f 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Settings/TermPartSettings.cs
@@ -4,5 +4,15 @@
         /// The display type to use for the child items of the term.
         /// </summary>
         public string ChildDisplayType { get; set; }
+
+        /// <summary>
+        /// If true, overrides default pagination settings with the PageSize value.
+        /// </summary>
+        public bool OverrideDefaultPagination { get; set; }
+
+        /// <summary>
+        /// The page size, if OverrideDefaultPagination is set to true.
+        /// </summary>
+        public int PageSize { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml
index 85bf95200..f9753364e 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TermPartSettings.cshtml
@@ -4,4 +4,16 @@
     @Html.TextBoxFor(m => m.ChildDisplayType, new { @class = "text medium" })
     <span class="hint">@T("The display type to apply to child items when displaying the details of this taxonomy term.")</span>
     @Html.ValidationMessageFor(m => m.ChildDisplayType)
-</fieldset>
\ No newline at end of file
+</fieldset>
+<fieldset>
+    <label>@T("Pagination")</label>
+    <div class="content">
+        @Html.CheckBoxFor(m => m.OverrideDefaultPagination)
+        <label class="forcheckbox" for="@Html.FieldIdFor(m => m.OverrideDefaultPagination)">@T("Override the default page size")</label>
+    </div>
+    <div data-controllerid="@Html.FieldIdFor(m => m.OverrideDefaultPagination)">
+        <label for="@Html.FieldIdFor(m => m.PageSize)">@T("Number of items per page")</label>
+        @Html.TextBoxFor(m => m.PageSize, new { @class = "text small" })
+        <span class="hint">@T("Determines the number of items that are shown per page.")</span>
+    </div>
+</fieldset>

From ece9cff117aa985a981e5bfa10b9c2d8d57be512 Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel.stolt@perceptible.net>
Date: Wed, 22 Jan 2014 21:27:16 +0100
Subject: [PATCH 18/21] #20433: Added specialized implementation of
 IMachineNameProvider that uses the role instance ID instead of the Windows
 machine name for task lease records, and activated this implementation for
 cloud services through Host.config. This makes task lease records resilient
 to role instance reimaging.

Work Item: 20433
---
 .../Orchard.Azure.Web/Config/Host.config         |  5 +++++
 .../Modules/Orchard.Azure/Orchard.Azure.csproj   |  9 +++++++++
 .../TaskLease/AzureMachineNameProvider.cs        | 16 ++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs

diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
index 008324024..7b6441f6c 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
@@ -7,9 +7,14 @@
 	
 	<autofac defaultAssembly="Orchard.Framework">
 		<components>
+			
 			<!-- Configure Orchard to store shell settings in Windows Azure Blob Storage. -->
 			<component instance-scope="single-instance" type="Orchard.FileSystems.Media.ConfigurationMimeTypeProvider, Orchard.Framework" service="Orchard.FileSystems.Media.IMimeTypeProvider"></component>
 			<component instance-scope="single-instance" type="Orchard.Azure.Services.Environment.Configuration.AzureBlobShellSettingsManager, Orchard.Azure" service="Orchard.Environment.Configuration.IShellSettingsManager"></component>
+			
+			<!-- Configure Orchard to use role instance ID instead of Windows machine name for task lease records. -->
+			<component instance-scope="single-instance" type="Orchard.Azure.Services.TaskLease.AzureMachineNameProvider, Orchard.Azure" service="Orchard.TaskLease.Services.IMachineNameProvider, Orchard.TaskLease"></component>
+			
 		</components>
 	</autofac>
 	
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
index 980749087..f7282d19c 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
@@ -69,6 +69,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.StorageUtility.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Storage.dll</HintPath>
@@ -84,6 +88,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Services\TaskLease\AzureMachineNameProvider.cs" />
     <Content Include="Web.config" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Content Include="Module.txt" />
@@ -97,6 +102,10 @@
       <Project>{6e444ff1-a47c-4cf6-bb3f-507c8ebd776d}</Project>
       <Name>Orchard.OutputCache</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Orchard.TaskLease\Orchard.TaskLease.csproj">
+      <Project>{3f72a4e9-7b72-4260-b010-c16ec54f9baf}</Project>
+      <Name>Orchard.TaskLease</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Constants.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs
new file mode 100644
index 000000000..57d260bc8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.WindowsAzure.ServiceRuntime;
+using Orchard.TaskLease.Services;
+
+namespace Orchard.Azure.Services.TaskLease
+{
+	public class AzureMachineNameProvider : IMachineNameProvider
+	{
+		public string GetMachineName()
+		{
+			return RoleEnvironment.CurrentRoleInstance.Id;
+		}
+	}
+}
\ No newline at end of file

From 2858fbf6608d35244989d6642a5bc47226fec3df Mon Sep 17 00:00:00 2001
From: Bertrand Le Roy <bertrandleroy@gmail.com>
Date: Wed, 22 Jan 2014 17:34:09 -0800
Subject: [PATCH 19/21] Fixed unclosed tag in media library field client-side
 template

---
 .../Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
index b38415df7..189914a34 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
@@ -60,7 +60,7 @@
         var multiple = @(settings.Multiple ? "true" : "false");
         var addButton = $('#btn-@fieldIdForIds');
         var @(fieldIdForIds)_Template = 
-            '<li><div data-id="{contentItemId}" data-fieldid="@fieldIdForIds" class="media-library-picker-item"><div class="thumbnail">{thumbnail}<div class="overlay"><h3>{title}</h3></div><div></div><a href="#" data-id="{contentItemId}" class="media-library-picker-remove">@T("Remove")</a>@T(" | ")<a href="{editLink}?ReturnUrl=@Request.RawUrl">@T("Edit")</a></li>';
+            '<li><div data-id="{contentItemId}" data-fieldid="@fieldIdForIds" class="media-library-picker-item"><div class="thumbnail">{thumbnail}<div class="overlay"><h3>{title}</h3></div></div></div><a href="#" data-id="{contentItemId}" class="media-library-picker-remove">@T("Remove")</a>@T(" | ")<a href="{editLink}?ReturnUrl=@Request.RawUrl">@T("Edit")</a></li>';
         
         var refreshIds = function() {
             var id = $('#@fieldIdForSelectedIds');

From cddd90e2f3e0e0129729cd92e2859f57e9aac053 Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel.stolt@perceptible.net>
Date: Fri, 24 Jan 2014 16:21:23 +0100
Subject: [PATCH 20/21] #20445: Changing CloudBlobContainerExtensions to use
 the new CloudBlockBlob.Exists() API instead of causing and swallowing
 exceptions.

Work Item: 20445
---
 .../FileSystems/CloudBlobContainerExtensions.cs        | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs
index eb12d52a9..d31932788 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs
@@ -10,15 +10,7 @@ namespace Orchard.Azure.Services.FileSystems {
         public static bool BlobExists(this CloudBlobContainer container, string path) {
             if (String.IsNullOrEmpty(path) || path.Trim() == String.Empty)
                 throw new ArgumentException("Path can't be empty");
-
-            try {
-                var blob = container.GetBlockBlobReference(path);
-                blob.FetchAttributes();
-                return true;
-            }
-            catch (StorageException) {
-                return false;
-            }
+            return container.GetBlockBlobReference(path).Exists();
         }
 
         public static void EnsureBlobExists(this CloudBlobContainer container, string path) {

From 047ecd71092ba1f549441d7911fe1456d61d932d Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Thu, 30 Jan 2014 16:58:58 -0800
Subject: [PATCH 21/21] Disposing sessions correctly

---
 src/Orchard/Data/SessionLocator.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs
index c6c9edae4..120d9c297 100644
--- a/src/Orchard/Data/SessionLocator.cs
+++ b/src/Orchard/Data/SessionLocator.cs
@@ -99,6 +99,12 @@ namespace Orchard.Data {
                     _cancelled = false;
                 }
             }
+
+            if (_session != null) {
+                _session.Dispose();
+                _session = null;
+            }
+
         }
 
         private void EnsureSession() {
@@ -114,7 +120,6 @@ namespace Orchard.Data {
         class OrchardSessionInterceptor : IInterceptor {
             private readonly ISessionInterceptor[] _interceptors;
             private readonly ILogger _logger;
-            private ISession _session;
 
             public OrchardSessionInterceptor(ISessionInterceptor[] interceptors, ILogger logger) {
                 _interceptors = interceptors;
@@ -236,8 +241,6 @@ namespace Orchard.Data {
             }
 
             void IInterceptor.SetSession(ISession session) {
-                _session = session;
-
                 if (_interceptors.Length == 0) return;
                 _interceptors.Invoke(i => i.SetSession(session), _logger);
             }