diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
index afb496446..10ec51a01 100644
--- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
+++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
@@ -117,9 +117,9 @@
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config
index 85b0f1754..ec07bf837 100644
--- a/src/Orchard.Tests.Modules/packages.config
+++ b/src/Orchard.Tests.Modules/packages.config
@@ -6,6 +6,7 @@
   <package id="IronRuby" version="1.1.3" targetFramework="net451" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net451" />
   <package id="Moq" version="4.0.10827" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net451" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
index 2220e5082..70790db04 100644
--- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
@@ -110,8 +110,9 @@
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config
index 2ddc673cf..5a1c76cff 100644
--- a/src/Orchard.Tests/packages.config
+++ b/src/Orchard.Tests/packages.config
@@ -6,5 +6,6 @@
   <package id="IronRuby" version="1.1.3" targetFramework="net451" />
   <package id="log4net" version="2.0.3" targetFramework="net451" />
   <package id="Moq" version="4.0.10827" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
index b04c39781..11feab583 100644
--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
@@ -50,9 +50,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -181,6 +181,9 @@
   <ItemGroup>
     <Content Include="Views\EditorTemplates\Parts\Antispam.JavaScriptAntiSpam.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
index 7b1e80893..7fdd97780 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
@@ -1,376 +1,378 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.AuditTrail</RootNamespace>
-    <AssemblyName>Orchard.AuditTrail</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\nhibernate\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="xmldiffpatch, Version=1.0.8.28, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\xmldiffpatch\xmldiffpatch.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Placement.info" />
-    <Content Include="Recipes\audit-trail.recipe.xml" />
-    <Content Include="Scripts\audittrail-recyclebin.js" />
-    <Content Include="Scripts\audittrail-expando.js" />
-    <Content Include="Scripts\audittrail-checkall.js" />
-    <Content Include="Scripts\audittrail-disabledcontent.js" />
-    <Content Include="Styles\audittrail-content-event.css" />
-    <Content Include="Styles\audittrail-recycle-bin.css" />
-    <Content Include="Styles\audittrail-display.css" />
-    <Content Include="Styles\audittrail-disabledcontent.css" />
-    <Content Include="Styles\audittrail-part.css" />
-    <Content Include="Styles\audittrail-contentdefinition-event.css" />
-    <Content Include="Styles\audittrail-settings-event.css" />
-    <Content Include="Styles\audittrail-settings.css" />
-    <Content Include="Styles\menu.audit-trail-admin.css" />
-    <Content Include="Web.config" />
-    <Content Include="Scripts\Web.config" />
-    <Content Include="Styles\Web.config" />
-    <Content Include="Properties\AssemblyInfo.cs" />
-    <Content Include="Module.txt" />
-    <Content Include="Views\Parts.Contents.AuditTrail.SummaryAdmin.cshtml" />
-    <Content Include="Views\DefinitionTemplates\AuditTrailPartSettings.cshtml" />
-    <Content Include="Views\Parts.AuditTrail.Link.cshtml" />
-    <Content Include="Views\Parts.AuditTrail.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-PartSettingsUpdated.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts.AuditTrailTrimmingSettings.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-Created.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-FieldAdded.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-FieldRemoved.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-FieldSettingsUpdated.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-PartSettingsUpdated.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-Removed.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-Created.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-PartAdded.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-PartRemoved.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-Removed.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-TypeSettingsUpdated.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-PermissionAdded.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-PermissionRemoved.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-Created.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-Renamed.cshtml" />
-    <Content Include="Views\AuditTrailEvent-User.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts.AuditTrailSettings.cshtml" />
-    <Content Include="Views\AuditTrailEvent-User-LoginFailed..cshtml" />
-    <Content Include="Views\AuditTrailFilter-Common-User.cshtml" />
-    <Content Include="Views\AuditTrailFilter-ContentType.cshtml" />
-    <Content Include="Views\AuditTrailFilter-Common-Date-From.cshtml" />
-    <Content Include="Views\AuditTrailFilter-ContentItem.cshtml" />
-    <Content Include="Views\AuditTrailFilter-Common-Category.cshtml" />
-    <Content Include="Views\Content\Detail.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Content.cshtml">
-      <SubType>Code</SubType>
-    </Content>
-    <Content Include="Views\AuditTrailFilter.cshtml" />
-    <Content Include="Views\AuditTrailFilter-Common-Date-To.cshtml" />
-    <Content Include="Views\AuditTrailEvent-AuditTrailSettings-EventsChanged.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-AuditTrailSettings-EventsChanged.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-TypeDisplayNameUpdated.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-TypeSettingsUpdated.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-PartSettingsUpdated.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-FieldSettingsUpdated.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-FieldSettingsUpdated.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-PartSettingsUpdated.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-Removed.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-UserAdded.cshtml" />
-    <Content Include="Views\AuditTrailEvent-Role-UserRemoved.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-DescriptionChanged.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-FieldSettingsUpdated.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-Imported.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-Imported.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentPart-Imported.SummaryAdmin.cshtml" />
-    <Content Include="Views\AuditTrailEvent-ContentType-Imported.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.ContentTypes\Orchard.ContentTypes.csproj">
-      <Project>{0e7646e8-fe8f-43c1-8799-d97860925ec4}</Project>
-      <Name>Orchard.ContentTypes</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.ImportExport\Orchard.ImportExport.csproj">
-      <Project>{fe5c5947-d2d5-42c5-992a-13d672946135}</Project>
-      <Name>Orchard.ImportExport</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Roles\Orchard.Roles.csproj">
-      <Project>{d10ad48f-407d-4db5-a328-173ec7cb010f}</Project>
-      <Name>Orchard.Roles</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.TaskLease\Orchard.TaskLease.csproj">
-      <Project>{3f72a4e9-7b72-4260-b010-c16ec54f9baf}</Project>
-      <Name>Orchard.TaskLease</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Users\Orchard.Users.csproj">
-      <Project>{79aed36e-abd0-4747-93d3-8722b042454b}</Project>
-      <Name>Orchard.Users</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Menus\AuditTrailAdminMenu.cs" />
-    <Compile Include="Menus\RecycleBinAdminMenu.cs" />
-    <Compile Include="Providers\AuditTrail\AuditTrailEventSettingEventData.cs" />
-    <Compile Include="Providers\AuditTrail\AuditTrailManagerExtensions.cs" />
-    <Compile Include="Recipes\Builders\AuditTrailStep.cs" />
-    <Compile Include="Recipes\Executors\AuditTrailStep.cs" />
-    <Compile Include="ViewModels\RecycleBinCommand.cs" />
-    <Compile Include="Controllers\RecycleBinController.cs" />
-    <Compile Include="Controllers\ContentController.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Helpers\ControllerExtensions.cs" />
-    <Compile Include="Helpers\HttpRequestExtensions.cs" />
-    <Compile Include="Services\IRecycleBin.cs" />
-    <Compile Include="Services\RecycleBin.cs" />
-    <Compile Include="ViewModels\RecycleBinViewModel.cs" />
-    <Compile Include="Drivers\AuditTrailTrimmingSettingsPartDriver.cs" />
-    <Compile Include="Drivers\AuditTrailSettingsPartDriver.cs" />
-    <Compile Include="Handlers\AuditTrailTrimmingSettingsPartHandler.cs" />
-    <Compile Include="Helpers\FiltersExtensions.cs" />
-    <Compile Include="Helpers\DateTimeExtensions.cs" />
-    <Compile Include="Helpers\SettingsDictionaryExtensions.cs" />
-    <Compile Include="Helpers\HtmlExtensions.cs" />
-    <Compile Include="Helpers\XmlHelper.cs" />
-    <Compile Include="Helpers\StringExtensions.cs" />
-    <Compile Include="Models\AuditTrailEventRecordResult.cs" />
-    <Compile Include="Models\AuditTrailTrimmingSettingsPart.cs" />
-    <Compile Include="Providers\AuditTrail\AuditTrailTrimmingSettingsEventProvider.cs" />
-    <Compile Include="Providers\AuditTrail\AuditTrailSettingsEventProvider.cs" />
-    <Compile Include="Providers\ContentDefinition\Shapes\ContentPartImportedEventShape.cs" />
-    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypeImportedEventShape.cs" />
-    <Compile Include="Services\Models\AuditTrailSettingsContext.cs" />
-    <Compile Include="Services\CommonAuditTrailEventHandler.cs" />
-    <Compile Include="Services\AuditTrailEventHandlerBase.cs" />
-    <Compile Include="Services\IAuditTrailSettingsEventHandler.cs" />
-    <Compile Include="Services\Models\DisplayFilterContext.cs" />
-    <Compile Include="Services\Models\QueryFilterContext.cs" />
-    <Compile Include="Providers\Content\ContentAuditTrailEventShapes.cs" />
-    <Compile Include="Services\DiffGramAnalyzer.cs" />
-    <Compile Include="Services\Models\DiffNode.cs" />
-    <Compile Include="Services\Models\DiffType.cs" />
-    <Compile Include="Services\Models\Filters.cs" />
-    <Compile Include="Services\IDiffGramAnalyzer.cs" />
-    <Compile Include="Services\AuditTrailTrimmingBackgroundTask.cs" />
-    <Compile Include="Providers\AuditTrail\AuditTrailFilterShapes.cs" />
-    <Compile Include="Shapes\AuditTrailEventShapeAlteration.cs" />
-    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypeFieldSettingsUpdatedEventShape.cs" />
-    <Compile Include="Providers\ContentDefinition\Shapes\ContentPartSettingsUpdatedEventShape.cs" />
-    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypePartSettingsUpdatedEventShape.cs" />
-    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypeSettingsUpdatedEventShape.cs" />
-    <Compile Include="Providers\AuditTrail\AuditTrailSettingsEventShape.cs" />
-    <Compile Include="Services\Models\Diff.cs" />
-    <Compile Include="Services\Models\DiffDictionary.cs" />
-    <Compile Include="ViewModels\AuditTrailCategorySettingsViewModel.cs" />
-    <Compile Include="ViewModels\AuditTrailEventDescriptorSettingViewModel.cs" />
-    <Compile Include="ViewModels\AuditTrailEventSettingsViewModel.cs" />
-    <Compile Include="ViewModels\AuditTrailTrimmingSettingsViewModel.cs" />
-    <Compile Include="ViewModels\AuditTrailSettingsViewModel.cs" />
-    <Compile Include="Drivers\ContentsDriver.cs" />
-    <Compile Include="Handlers\AuditTrailSettingsPartHandler.cs" />
-    <Compile Include="Models\AuditTrailEventSetting.cs" />
-    <Compile Include="Models\AuditTrailSettingsPart.cs" />
-    <Compile Include="Providers\ContentDefinition\ContentDefinitionEventHandler.cs" />
-    <Compile Include="Providers\ContentDefinition\GlobalContentDefinitionEditorEvents.cs" />
-    <Compile Include="Providers\ContentDefinition\ContentPartAuditTrailEventProvider.cs" />
-    <Compile Include="Providers\ContentDefinition\ContentTypeAuditTrailEventProvider.cs" />
-    <Compile Include="Providers\Content\AuditTrailEventHandler.cs" />
-    <Compile Include="Helpers\EventDataExtensions.cs" />
-    <Compile Include="Services\Models\AuditTrailFilterParameters.cs" />
-    <Compile Include="Providers\Roles\RoleEventHandler.cs" />
-    <Compile Include="Providers\Roles\RoleAuditTrailEventProvider.cs" />
-    <Compile Include="Providers\Users\UserAuditTrailEventProvider.cs" />
-    <Compile Include="Providers\Users\UserEventHandler.cs" />
-    <Compile Include="Settings\AuditTrailPartSettings.cs" />
-    <Compile Include="Settings\AuditTrailPartSettingsEvents.cs" />
-    <Compile Include="ViewModels\AuditTrailEventSummaryViewModel.cs" />
-    <Compile Include="Drivers\AuditTrailPartDriver.cs" />
-    <Compile Include="Helpers\EventNameExtensions.cs" />
-    <Compile Include="Models\AuditTrailPart.cs" />
-    <Compile Include="Services\AuditTrailEventDisplayBuilder.cs" />
-    <Compile Include="Services\EventDataSerializer.cs" />
-    <Compile Include="Services\IAuditTrailEventDisplayBuilder.cs" />
-    <Compile Include="Services\IEventDataSerializer.cs" />
-    <Compile Include="ViewModels\AuditTrailDetailsViewModel.cs" />
-    <Compile Include="Providers\Content\GlobalContentHandler.cs" />
-    <Compile Include="Services\Models\AuditTrailEventDescriptor.cs" />
-    <Compile Include="Services\Models\AuditTrailCategoryDescriptor.cs" />
-    <Compile Include="Services\Models\DescribeContext.cs" />
-    <Compile Include="Services\Models\DescribeFor.cs" />
-    <Compile Include="Services\Models\AuditTrailContext.cs" />
-    <Compile Include="Services\Models\AuditTrailCreateContext.cs" />
-    <Compile Include="Services\AuditTrailEventProviderBase.cs" />
-    <Compile Include="Providers\Content\ContentAuditTrailEventProvider.cs" />
-    <Compile Include="Services\IAuditTrailEventHandler.cs" />
-    <Compile Include="Services\IAuditTrailEventProvider.cs" />
-    <Compile Include="ViewModels\AuditTrailCommentViewModel.cs" />
-    <Compile Include="ViewModels\CommonAuditTrailFilterViewModel.cs" />
-    <Compile Include="Services\Models\AuditTrailOrderBy.cs" />
-    <Compile Include="ViewModels\AuditTrailViewModel.cs" />
-    <Compile Include="Migrations.cs" />
-    <Compile Include="Models\AuditTrailEventRecord.cs" />
-    <Compile Include="Permissions.cs" />
-    <Compile Include="Services\AuditTrailManager.cs" />
-    <Compile Include="Services\IAuditTrailManager.cs" />
-    <Compile Include="ViewModels\RemovedContentItemViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Detail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEvent.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEvent-Content.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEvent-AuditTrailSettings-TrimmingSettingsChanged.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Parts.AuditTrail.Comment.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEventActions.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEventActions-Content-Published.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\RecycleBin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEventActions-Content-Removed.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\AuditTrailEvent-Content-Restored.SummaryAdmin.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" DependsOnTargets="AfterBuildCompiler">
-    <PropertyGroup>
-      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
-    </PropertyGroup>
-    <!-- If this is an area child project, uncomment the following line:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    -->
-    <!-- If this is an area parent project, uncomment the following lines:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-    -->
-  </Target>
-  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>45979</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.AuditTrail</RootNamespace>
+    <AssemblyName>Orchard.AuditTrail</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\nhibernate\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="xmldiffpatch, Version=1.0.8.28, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\xmldiffpatch\xmldiffpatch.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Placement.info" />
+    <Content Include="Recipes\audit-trail.recipe.xml" />
+    <Content Include="Scripts\audittrail-recyclebin.js" />
+    <Content Include="Scripts\audittrail-expando.js" />
+    <Content Include="Scripts\audittrail-checkall.js" />
+    <Content Include="Scripts\audittrail-disabledcontent.js" />
+    <Content Include="Styles\audittrail-content-event.css" />
+    <Content Include="Styles\audittrail-recycle-bin.css" />
+    <Content Include="Styles\audittrail-display.css" />
+    <Content Include="Styles\audittrail-disabledcontent.css" />
+    <Content Include="Styles\audittrail-part.css" />
+    <Content Include="Styles\audittrail-contentdefinition-event.css" />
+    <Content Include="Styles\audittrail-settings-event.css" />
+    <Content Include="Styles\audittrail-settings.css" />
+    <Content Include="Styles\menu.audit-trail-admin.css" />
+    <Content Include="Web.config" />
+    <Content Include="Scripts\Web.config" />
+    <Content Include="Styles\Web.config" />
+    <Content Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Module.txt" />
+    <Content Include="Views\Parts.Contents.AuditTrail.SummaryAdmin.cshtml" />
+    <Content Include="Views\DefinitionTemplates\AuditTrailPartSettings.cshtml" />
+    <Content Include="Views\Parts.AuditTrail.Link.cshtml" />
+    <Content Include="Views\Parts.AuditTrail.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-PartSettingsUpdated.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.AuditTrailTrimmingSettings.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-Created.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-FieldAdded.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-FieldRemoved.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-FieldSettingsUpdated.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-PartSettingsUpdated.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-Removed.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-Created.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-PartAdded.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-PartRemoved.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-Removed.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-TypeSettingsUpdated.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-PermissionAdded.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-PermissionRemoved.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-Created.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-Renamed.cshtml" />
+    <Content Include="Views\AuditTrailEvent-User.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.AuditTrailSettings.cshtml" />
+    <Content Include="Views\AuditTrailEvent-User-LoginFailed..cshtml" />
+    <Content Include="Views\AuditTrailFilter-Common-User.cshtml" />
+    <Content Include="Views\AuditTrailFilter-ContentType.cshtml" />
+    <Content Include="Views\AuditTrailFilter-Common-Date-From.cshtml" />
+    <Content Include="Views\AuditTrailFilter-ContentItem.cshtml" />
+    <Content Include="Views\AuditTrailFilter-Common-Category.cshtml" />
+    <Content Include="Views\Content\Detail.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Content.cshtml">
+      <SubType>Code</SubType>
+    </Content>
+    <Content Include="Views\AuditTrailFilter.cshtml" />
+    <Content Include="Views\AuditTrailFilter-Common-Date-To.cshtml" />
+    <Content Include="Views\AuditTrailEvent-AuditTrailSettings-EventsChanged.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-AuditTrailSettings-EventsChanged.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-TypeDisplayNameUpdated.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-TypeSettingsUpdated.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-PartSettingsUpdated.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-FieldSettingsUpdated.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-FieldSettingsUpdated.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-PartSettingsUpdated.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-Removed.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-UserAdded.cshtml" />
+    <Content Include="Views\AuditTrailEvent-Role-UserRemoved.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-DescriptionChanged.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-FieldSettingsUpdated.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-Imported.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-Imported.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentPart-Imported.SummaryAdmin.cshtml" />
+    <Content Include="Views\AuditTrailEvent-ContentType-Imported.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.ContentTypes\Orchard.ContentTypes.csproj">
+      <Project>{0e7646e8-fe8f-43c1-8799-d97860925ec4}</Project>
+      <Name>Orchard.ContentTypes</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.ImportExport\Orchard.ImportExport.csproj">
+      <Project>{fe5c5947-d2d5-42c5-992a-13d672946135}</Project>
+      <Name>Orchard.ImportExport</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Roles\Orchard.Roles.csproj">
+      <Project>{d10ad48f-407d-4db5-a328-173ec7cb010f}</Project>
+      <Name>Orchard.Roles</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.TaskLease\Orchard.TaskLease.csproj">
+      <Project>{3f72a4e9-7b72-4260-b010-c16ec54f9baf}</Project>
+      <Name>Orchard.TaskLease</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Users\Orchard.Users.csproj">
+      <Project>{79aed36e-abd0-4747-93d3-8722b042454b}</Project>
+      <Name>Orchard.Users</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Menus\AuditTrailAdminMenu.cs" />
+    <Compile Include="Menus\RecycleBinAdminMenu.cs" />
+    <Compile Include="Providers\AuditTrail\AuditTrailEventSettingEventData.cs" />
+    <Compile Include="Providers\AuditTrail\AuditTrailManagerExtensions.cs" />
+    <Compile Include="Recipes\Builders\AuditTrailStep.cs" />
+    <Compile Include="Recipes\Executors\AuditTrailStep.cs" />
+    <Compile Include="ViewModels\RecycleBinCommand.cs" />
+    <Compile Include="Controllers\RecycleBinController.cs" />
+    <Compile Include="Controllers\ContentController.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Helpers\ControllerExtensions.cs" />
+    <Compile Include="Helpers\HttpRequestExtensions.cs" />
+    <Compile Include="Services\IRecycleBin.cs" />
+    <Compile Include="Services\RecycleBin.cs" />
+    <Compile Include="ViewModels\RecycleBinViewModel.cs" />
+    <Compile Include="Drivers\AuditTrailTrimmingSettingsPartDriver.cs" />
+    <Compile Include="Drivers\AuditTrailSettingsPartDriver.cs" />
+    <Compile Include="Handlers\AuditTrailTrimmingSettingsPartHandler.cs" />
+    <Compile Include="Helpers\FiltersExtensions.cs" />
+    <Compile Include="Helpers\DateTimeExtensions.cs" />
+    <Compile Include="Helpers\SettingsDictionaryExtensions.cs" />
+    <Compile Include="Helpers\HtmlExtensions.cs" />
+    <Compile Include="Helpers\XmlHelper.cs" />
+    <Compile Include="Helpers\StringExtensions.cs" />
+    <Compile Include="Models\AuditTrailEventRecordResult.cs" />
+    <Compile Include="Models\AuditTrailTrimmingSettingsPart.cs" />
+    <Compile Include="Providers\AuditTrail\AuditTrailTrimmingSettingsEventProvider.cs" />
+    <Compile Include="Providers\AuditTrail\AuditTrailSettingsEventProvider.cs" />
+    <Compile Include="Providers\ContentDefinition\Shapes\ContentPartImportedEventShape.cs" />
+    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypeImportedEventShape.cs" />
+    <Compile Include="Services\Models\AuditTrailSettingsContext.cs" />
+    <Compile Include="Services\CommonAuditTrailEventHandler.cs" />
+    <Compile Include="Services\AuditTrailEventHandlerBase.cs" />
+    <Compile Include="Services\IAuditTrailSettingsEventHandler.cs" />
+    <Compile Include="Services\Models\DisplayFilterContext.cs" />
+    <Compile Include="Services\Models\QueryFilterContext.cs" />
+    <Compile Include="Providers\Content\ContentAuditTrailEventShapes.cs" />
+    <Compile Include="Services\DiffGramAnalyzer.cs" />
+    <Compile Include="Services\Models\DiffNode.cs" />
+    <Compile Include="Services\Models\DiffType.cs" />
+    <Compile Include="Services\Models\Filters.cs" />
+    <Compile Include="Services\IDiffGramAnalyzer.cs" />
+    <Compile Include="Services\AuditTrailTrimmingBackgroundTask.cs" />
+    <Compile Include="Providers\AuditTrail\AuditTrailFilterShapes.cs" />
+    <Compile Include="Shapes\AuditTrailEventShapeAlteration.cs" />
+    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypeFieldSettingsUpdatedEventShape.cs" />
+    <Compile Include="Providers\ContentDefinition\Shapes\ContentPartSettingsUpdatedEventShape.cs" />
+    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypePartSettingsUpdatedEventShape.cs" />
+    <Compile Include="Providers\ContentDefinition\Shapes\ContentTypeSettingsUpdatedEventShape.cs" />
+    <Compile Include="Providers\AuditTrail\AuditTrailSettingsEventShape.cs" />
+    <Compile Include="Services\Models\Diff.cs" />
+    <Compile Include="Services\Models\DiffDictionary.cs" />
+    <Compile Include="ViewModels\AuditTrailCategorySettingsViewModel.cs" />
+    <Compile Include="ViewModels\AuditTrailEventDescriptorSettingViewModel.cs" />
+    <Compile Include="ViewModels\AuditTrailEventSettingsViewModel.cs" />
+    <Compile Include="ViewModels\AuditTrailTrimmingSettingsViewModel.cs" />
+    <Compile Include="ViewModels\AuditTrailSettingsViewModel.cs" />
+    <Compile Include="Drivers\ContentsDriver.cs" />
+    <Compile Include="Handlers\AuditTrailSettingsPartHandler.cs" />
+    <Compile Include="Models\AuditTrailEventSetting.cs" />
+    <Compile Include="Models\AuditTrailSettingsPart.cs" />
+    <Compile Include="Providers\ContentDefinition\ContentDefinitionEventHandler.cs" />
+    <Compile Include="Providers\ContentDefinition\GlobalContentDefinitionEditorEvents.cs" />
+    <Compile Include="Providers\ContentDefinition\ContentPartAuditTrailEventProvider.cs" />
+    <Compile Include="Providers\ContentDefinition\ContentTypeAuditTrailEventProvider.cs" />
+    <Compile Include="Providers\Content\AuditTrailEventHandler.cs" />
+    <Compile Include="Helpers\EventDataExtensions.cs" />
+    <Compile Include="Services\Models\AuditTrailFilterParameters.cs" />
+    <Compile Include="Providers\Roles\RoleEventHandler.cs" />
+    <Compile Include="Providers\Roles\RoleAuditTrailEventProvider.cs" />
+    <Compile Include="Providers\Users\UserAuditTrailEventProvider.cs" />
+    <Compile Include="Providers\Users\UserEventHandler.cs" />
+    <Compile Include="Settings\AuditTrailPartSettings.cs" />
+    <Compile Include="Settings\AuditTrailPartSettingsEvents.cs" />
+    <Compile Include="ViewModels\AuditTrailEventSummaryViewModel.cs" />
+    <Compile Include="Drivers\AuditTrailPartDriver.cs" />
+    <Compile Include="Helpers\EventNameExtensions.cs" />
+    <Compile Include="Models\AuditTrailPart.cs" />
+    <Compile Include="Services\AuditTrailEventDisplayBuilder.cs" />
+    <Compile Include="Services\EventDataSerializer.cs" />
+    <Compile Include="Services\IAuditTrailEventDisplayBuilder.cs" />
+    <Compile Include="Services\IEventDataSerializer.cs" />
+    <Compile Include="ViewModels\AuditTrailDetailsViewModel.cs" />
+    <Compile Include="Providers\Content\GlobalContentHandler.cs" />
+    <Compile Include="Services\Models\AuditTrailEventDescriptor.cs" />
+    <Compile Include="Services\Models\AuditTrailCategoryDescriptor.cs" />
+    <Compile Include="Services\Models\DescribeContext.cs" />
+    <Compile Include="Services\Models\DescribeFor.cs" />
+    <Compile Include="Services\Models\AuditTrailContext.cs" />
+    <Compile Include="Services\Models\AuditTrailCreateContext.cs" />
+    <Compile Include="Services\AuditTrailEventProviderBase.cs" />
+    <Compile Include="Providers\Content\ContentAuditTrailEventProvider.cs" />
+    <Compile Include="Services\IAuditTrailEventHandler.cs" />
+    <Compile Include="Services\IAuditTrailEventProvider.cs" />
+    <Compile Include="ViewModels\AuditTrailCommentViewModel.cs" />
+    <Compile Include="ViewModels\CommonAuditTrailFilterViewModel.cs" />
+    <Compile Include="Services\Models\AuditTrailOrderBy.cs" />
+    <Compile Include="ViewModels\AuditTrailViewModel.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Models\AuditTrailEventRecord.cs" />
+    <Compile Include="Permissions.cs" />
+    <Compile Include="Services\AuditTrailManager.cs" />
+    <Compile Include="Services\IAuditTrailManager.cs" />
+    <Compile Include="ViewModels\RemovedContentItemViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Detail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEvent.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEvent-Content.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEvent-AuditTrailSettings-TrimmingSettingsChanged.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts.AuditTrail.Comment.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEventActions.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEventActions-Content-Published.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\RecycleBin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEventActions-Content-Removed.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\AuditTrailEvent-Content-Restored.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </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" DependsOnTargets="AfterBuildCompiler">
+    <PropertyGroup>
+      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
+    </PropertyGroup>
+    <!-- If this is an area child project, uncomment the following line:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    -->
+    <!-- If this is an area parent project, uncomment the following lines:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
+    -->
+  </Target>
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</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.AuditTrail/packages.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
index c6c418583..a54ef4b66 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
@@ -92,9 +92,8 @@
     <Reference Include="Microsoft.WindowsAzure.Storage">
       <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate">
diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
index 46d2216af..bef03c2c7 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
index 6c3eb0521..017fb54b7 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
@@ -82,9 +82,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config
index 8ec03b3bc..23bee5eee 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.3" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
index 3b4081dd4..5d381921b 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
@@ -1,568 +1,571 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{82190F52-2901-46D6-8A4C-34649959483F}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.DynamicForms</RootNamespace>
-    <AssemblyName>Orchard.DynamicForms</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Assets\CSS\DynamicForms-Admin.css" />
-    <Content Include="Assets\CSS\DynamicForms.css" />
-    <Content Include="Scripts\LayoutEditor.js" />
-    <Content Include="Scripts\LayoutEditor.min.js" />
-    <Content Include="Assets\JavaScript\LayoutEditor\Directives\Fieldset.js" />
-    <Content Include="Assets\JavaScript\LayoutEditor\Directives\Form.js" />
-    <Content Include="Assets\JavaScript\LayoutEditor\Models\Fieldset.js" />
-    <Content Include="Assets\JavaScript\LayoutEditor\Models\Form.js" />
-    <Content Include="Scripts\Lib.js" />
-    <Content Include="Scripts\Lib.min.js" />
-    <Content Include="Assets\JavaScript\Lib\jquery.validate.js" />
-    <Content Include="Assets\JavaScript\Lib\jquery.validate.unobtrusive.additional.js" />
-    <Content Include="Assets\JavaScript\Lib\jquery.validate.unobtrusive.js" />
-    <Content Include="Styles\DynamicForms-Admin.css" />
-    <Content Include="Styles\DynamicForms-Admin.min.css" />
-    <Content Include="Styles\DynamicForms.css" />
-    <Content Include="Styles\DynamicForms.min.css" />
-    <Content Include="Styles\menu.dynamicforms-admin.css" />
-    <Content Include="Styles\menu.dynamicforms.png" />
-    <Content Include="Styles\workflows-activity-add-model-error.css" />
-    <Content Include="Styles\workflows-activity-dynamic-form-submitted.css" />
-    <Content Include="Styles\workflows-activity-dynamic-form-validating.css" />
-    <Content Include="Web.config" />
-    <Content Include="Scripts\Web.config" />
-    <Content Include="Styles\Web.config" />
-    <Content Include="Properties\AssemblyInfo.cs" />
-    <Content Include="Module.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.AntiSpam\Orchard.AntiSpam.csproj">
-      <Project>{91bc2e7f-da04-421c-98ef-76d37cec130c}</Project>
-      <Name>Orchard.AntiSpam</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Fields\Orchard.Fields.csproj">
-      <Project>{3787dde5-e5c8-4841-bda7-dcb325388064}</Project>
-      <Name>Orchard.Fields</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
-      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
-      <Name>Orchard.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Layouts\Orchard.Layouts.csproj">
-      <Project>{6bd8b2fa-f2e3-4ac8-a4c3-2925a653889a}</Project>
-      <Name>Orchard.Layouts</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Projections\Orchard.Projections.csproj">
-      <Project>{5531e894-d259-45a3-aa61-26dbe720c1ce}</Project>
-      <Name>Orchard.Projections</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Scripting.CSharp\Orchard.Scripting.CSharp.csproj">
-      <Project>{5d13ef34-8b39-4ec5-847f-e12892acf841}</Project>
-      <Name>Orchard.Scripting.CSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Taxonomies\Orchard.Taxonomies.csproj">
-      <Project>{e649ea64-d213-461b-87f7-d67035801443}</Project>
-      <Name>Orchard.Taxonomies</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
-      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
-      <Name>Orchard.Tokens</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Users\Orchard.Users.csproj">
-      <Project>{79aed36e-abd0-4747-93d3-8722b042454b}</Project>
-      <Name>Orchard.Users</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
-      <Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
-      <Name>Orchard.Workflows</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Activities\DynamicFormActivity.cs" />
-    <Compile Include="Activities\AddModelErrorActivity.cs" />
-    <Compile Include="Activities\DynamicFormValidatingActivity.cs" />
-    <Compile Include="Activities\DynamicFormSubmittedActivity.cs" />
-    <Compile Include="Bindings\BooleanFieldBindings.cs" />
-    <Compile Include="Bindings\EnumerationFieldBindings.cs" />
-    <Compile Include="Bindings\InputFieldBindings.cs" />
-    <Compile Include="Bindings\TaxonomyFieldBindings.cs" />
-    <Compile Include="Drivers\FieldsetElementDriver.cs" />
-    <Compile Include="Drivers\UrlFieldElementDriver.cs" />
-    <Compile Include="Elements\Fieldset.cs" />
-    <Compile Include="Elements\UrlField.cs" />
-    <Compile Include="Bindings\NumericFieldBindings.cs" />
-    <Compile Include="Forms\AddModelErrorForm.cs" />
-    <Compile Include="Forms\SelectDynamicForms.cs" />
-    <Compile Include="Bindings\TextFieldBindings.cs" />
-    <Compile Include="Bindings\BodyPartBindings.cs" />
-    <Compile Include="Bindings\UserPartBindings.cs" />
-    <Compile Include="Controllers\SubmissionAdminController.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Controllers\FormController.cs" />
-    <Compile Include="Drivers\EmailFieldElementDriver.cs" />
-    <Compile Include="Drivers\PasswordFieldElementDriver.cs" />
-    <Compile Include="Drivers\QueryElementDriver.cs" />
-    <Compile Include="Drivers\ReCaptchaElementDriver.cs" />
-    <Compile Include="Drivers\ValidationMessageElementDriver.cs" />
-    <Compile Include="Drivers\ValidationSummaryElementDriver.cs" />
-    <Compile Include="Elements\EmailField.cs" />
-    <Compile Include="Elements\PasswordField.cs" />
-    <Compile Include="Elements\Query.cs" />
-    <Compile Include="Elements\ReCaptcha.cs" />
-    <Compile Include="Elements\ValidationMessage.cs" />
-    <Compile Include="Elements\ValidationSummary.cs" />
-    <Compile Include="Forms\DynamicFormValidatingForm.cs" />
-    <Compile Include="Handlers\ClientValidationRegistrationCoordinator.cs" />
-    <Compile Include="Handlers\LayoutEditorShapeEventHandler.cs" />
-    <Compile Include="Handlers\WorkflowValidatorCoordinator.cs" />
-    <Compile Include="ResourceManifest.cs" />
-    <Compile Include="Services\FieldsetModelMap.cs" />
-    <Compile Include="Services\FormModelMap.cs" />
-    <Compile Include="Services\Models\FormSubmissionTokenContext.cs" />
-    <Compile Include="Handlers\ValidatorsCoordinator.cs" />
-    <Compile Include="Handlers\FormSubmissionCoordinator.cs" />
-    <Compile Include="Helpers\FormControllerExtensions.cs" />
-    <Compile Include="Helpers\FieldValidatorsExtensions.cs" />
-    <Compile Include="Helpers\StringExtensions.cs" />
-    <Compile Include="Services\ElementValidator.cs" />
-    <Compile Include="Services\FormEventHandlerBase.cs" />
-    <Compile Include="Services\IValidationRuleFactory.cs" />
-    <Compile Include="Services\ITempDataAccessor.cs" />
-    <Compile Include="Services\IElementValidator.cs" />
-    <Compile Include="Services\Models\RegisterClientValidationAttributesContext.cs" />
-    <Compile Include="Services\Models\ValidationContext.cs" />
-    <Compile Include="Services\ValidationRuleFactory.cs" />
-    <Compile Include="Services\IValidationRule.cs" />
-    <Compile Include="Tokens\FormTokens.cs" />
-    <Compile Include="ValidationRules\OptionRequired.cs" />
-    <Compile Include="ValidationRules\Mandatory.cs" />
-    <Compile Include="ValidationRules\Compare.cs" />
-    <Compile Include="ValidationRules\EmailAddress.cs" />
-    <Compile Include="ValidationRules\RegularExpression.cs" />
-    <Compile Include="ValidationRules\StringLength.cs" />
-    <Compile Include="ValidationRules\UrlAddress.cs" />
-    <Compile Include="Validators\QueryValidator.cs" />
-    <Compile Include="Validators\Settings\UrlFieldValidationSettings.cs" />
-    <Compile Include="Validators\TaxonomyValidator.cs" />
-    <Compile Include="Validators\EnumerationValidator.cs" />
-    <Compile Include="Validators\CheckBoxValidator.cs" />
-    <Compile Include="ValidationRules\Required.cs" />
-    <Compile Include="Services\ValidationRule.cs" />
-    <Compile Include="Validators\EmailFieldValidator.cs" />
-    <Compile Include="Validators\Settings\EnumerationValidationSettings.cs" />
-    <Compile Include="Validators\Settings\CheckBoxValidationSettings.cs" />
-    <Compile Include="Validators\Settings\EmailFieldValidationSettings.cs" />
-    <Compile Include="Validators\Settings\PasswordFieldValidationSettings.cs" />
-    <Compile Include="Validators\Settings\ReCaptchaValidationSettings.cs" />
-    <Compile Include="Validators\Settings\TextAreaValidationSettings.cs" />
-    <Compile Include="Validators\Settings\TextFieldValidationSettings.cs" />
-    <Compile Include="Services\Models\ValidationSettingsBase.cs" />
-    <Compile Include="Services\Models\FormEventContext.cs" />
-    <Compile Include="Drivers\ValidationElementDriver.cs" />
-    <Compile Include="Drivers\BindingsElementDriver.cs" />
-    <Compile Include="Drivers\TaxonomyElementDriver.cs" />
-    <Compile Include="Drivers\HiddenFieldElementDriver.cs" />
-    <Compile Include="Drivers\CheckboxElementDriver.cs" />
-    <Compile Include="Drivers\TextAreaElementDriver.cs" />
-    <Compile Include="Drivers\RadioButtonElementDriver.cs" />
-    <Compile Include="Drivers\EnumerationElementDriver.cs" />
-    <Compile Include="Drivers\UserNameFieldElementDriver.cs" />
-    <Compile Include="Elements\LabeledFormElement.cs" />
-    <Compile Include="Elements\Taxonomy.cs" />
-    <Compile Include="Elements\HiddenField.cs" />
-    <Compile Include="Elements\Checkbox.cs" />
-    <Compile Include="Elements\RadioButton.cs" />
-    <Compile Include="Elements\TextArea.cs" />
-    <Compile Include="Elements\Enumeration.cs" />
-    <Compile Include="Elements\UserNameField.cs" />
-    <Compile Include="Forms\AutoLabelForm.cs" />
-    <Compile Include="Handlers\UserNameFieldHandler.cs" />
-    <Compile Include="Helpers\StreamExtensions.cs" />
-    <Compile Include="Helpers\DataTableExtensions.cs" />
-    <Compile Include="Helpers\TokenizerExtensions.cs" />
-    <Compile Include="Recipes\Builders\FormSubmissionsStep.cs" />
-    <Compile Include="Recipes\Executors\FormSubmissionsStep.cs" />
-    <Compile Include="Services\IDynamicFormEventHandler.cs" />
-    <Compile Include="Services\Models\FieldValidatorDescriptor.cs" />
-    <Compile Include="Services\Models\FormSubmittedEventContext.cs" />
-    <Compile Include="Services\Models\FormValidatedEventContext.cs" />
-    <Compile Include="Services\Models\FormValidatingEventContext.cs" />
-    <Compile Include="Services\Models\BindingDescriptor.cs" />
-    <Compile Include="Services\Models\ContentFieldBindingDescriptor.cs" />
-    <Compile Include="Services\Models\ContentPartBindingDescriptor.cs" />
-    <Compile Include="Services\Models\ValidateInputContext.cs" />
-    <Compile Include="Validators\PasswordFieldValidator.cs" />
-    <Compile Include="Validators\ReCaptchaValidator.cs" />
-    <Compile Include="Validators\TextAreaValidator.cs" />
-    <Compile Include="Validators\TextFieldValidator.cs" />
-    <Compile Include="Validators\UrlFieldValidator.cs" />
-    <Compile Include="ViewModels\FieldValidationSettings.cs" />
-    <Compile Include="ViewModels\FormBindingSettings.cs" />
-    <Compile Include="Helpers\ContentTypeDefinitionExtensions.cs" />
-    <Compile Include="Services\BindingManager.cs" />
-    <Compile Include="Services\IBindingManager.cs" />
-    <Compile Include="Services\IBindingProvider.cs" />
-    <Compile Include="Services\Models\BindingDescribeContext.cs" />
-    <Compile Include="Services\Models\BindingContext.cs" />
-    <Compile Include="Bindings\TitlePartBindings.cs" />
-    <Compile Include="ViewModels\BindingSettings.cs" />
-    <Compile Include="ViewModels\FieldBindingSettings.cs" />
-    <Compile Include="ViewModels\PartBindingSettings.cs" />
-    <Compile Include="ViewModels\BlueprintsIndexViewModel.cs" />
-    <Compile Include="ViewModels\ReCaptchaElementViewModel.cs" />
-    <Compile Include="ViewModels\SubmissionViewModel.cs" />
-    <Compile Include="ViewModels\SubmissionsIndexViewModel.cs" />
-    <Compile Include="Helpers\SubmissionExtensions.cs" />
-    <Compile Include="ViewModels\FormsIndexViewModel.cs" />
-    <Compile Include="Drivers\CommonFormElementDriver.cs" />
-    <Compile Include="Drivers\FormElementDriver.cs" />
-    <Compile Include="Drivers\ButtonElementDriver.cs" />
-    <Compile Include="Drivers\IpAddressFieldElementDriver.cs" />
-    <Compile Include="Elements\IpAddressField.cs" />
-    <Compile Include="Handlers\IpAddressFieldHandler.cs" />
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Migrations.cs" />
-    <Compile Include="Handlers\ReadFormValuesHandler.cs" />
-    <Compile Include="Services\FormElementEventHandlerBase.cs" />
-    <Compile Include="Helpers\NameValueCollectionExtensions.cs" />
-    <Compile Include="Models\Submission.cs" />
-    <Compile Include="Permissions.cs" />
-    <Compile Include="Services\FormService.cs" />
-    <Compile Include="Services\IFormElementEventHandler.cs" />
-    <Compile Include="Services\IFormService.cs" />
-    <Compile Include="Drivers\LabelElementDriver.cs" />
-    <Compile Include="Drivers\TextFieldElementDriver.cs" />
-    <Compile Include="Elements\FormCategoryProvider.cs" />
-    <Compile Include="Elements\FormElement.cs" />
-    <Compile Include="Elements\Form.cs" />
-    <Compile Include="Elements\Button.cs" />
-    <Compile Include="Elements\Label.cs" />
-    <Compile Include="Elements\TextField.cs" />
-    <Compile Include="Services\ReadElementValuesContext.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SubmissionAdmin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\TextField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Button.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Form.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Label.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\TextField.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\IpAddressField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\IpAddressField.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SubmissionAdmin\Details.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\FormBindings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\UserNameField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\UserNameField.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\HiddenField.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\HiddenField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\TextArea.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\TextArea.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\RadioButton.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\RadioButton.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Checkbox.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Checkbox.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-SelectList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-MultiSelectList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-RadioList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-CheckList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-SelectList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-RadioList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-MultiSelectList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-CheckList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-DynamicFormSubmitted.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\BlueprintAdmin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\ValidationSummary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\ValidationSummary.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\ValidationMessage.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\ValidationMessage.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\FormElement.Wrapper.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\PasswordField.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\PasswordField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-SelectList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-CheckList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-MultiSelectList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-RadioList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\EmailField.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\EmailField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\ReCaptcha.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\ReCaptcha.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\LayoutEditor.Template.Form.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-RadioList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-CheckList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-SelectList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Enumeration-MultiSelectList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-CheckList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-MultiSelectList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-RadioList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Taxonomy-SelectList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-CheckList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-MultiSelectList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-RadioList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Query-SelectList.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Fieldset.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\LayoutEditor.Template.Fieldset.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Button.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\Label.Design.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Assets.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\UrlField.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Elements\UrlField.Design.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="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.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" DependsOnTargets="AfterBuildCompiler">
-    <PropertyGroup>
-      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
-    </PropertyGroup>
-    <!-- If this is an area child project, uncomment the following line:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    -->
-    <!-- If this is an area parent project, uncomment the following lines:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-    -->
-  </Target>
-  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>45979</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{82190F52-2901-46D6-8A4C-34649959483F}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.DynamicForms</RootNamespace>
+    <AssemblyName>Orchard.DynamicForms</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\CSS\DynamicForms-Admin.css" />
+    <Content Include="Assets\CSS\DynamicForms.css" />
+    <Content Include="Scripts\LayoutEditor.js" />
+    <Content Include="Scripts\LayoutEditor.min.js" />
+    <Content Include="Assets\JavaScript\LayoutEditor\Directives\Fieldset.js" />
+    <Content Include="Assets\JavaScript\LayoutEditor\Directives\Form.js" />
+    <Content Include="Assets\JavaScript\LayoutEditor\Models\Fieldset.js" />
+    <Content Include="Assets\JavaScript\LayoutEditor\Models\Form.js" />
+    <Content Include="Scripts\Lib.js" />
+    <Content Include="Scripts\Lib.min.js" />
+    <Content Include="Assets\JavaScript\Lib\jquery.validate.js" />
+    <Content Include="Assets\JavaScript\Lib\jquery.validate.unobtrusive.additional.js" />
+    <Content Include="Assets\JavaScript\Lib\jquery.validate.unobtrusive.js" />
+    <Content Include="Styles\DynamicForms-Admin.css" />
+    <Content Include="Styles\DynamicForms-Admin.min.css" />
+    <Content Include="Styles\DynamicForms.css" />
+    <Content Include="Styles\DynamicForms.min.css" />
+    <Content Include="Styles\menu.dynamicforms-admin.css" />
+    <Content Include="Styles\menu.dynamicforms.png" />
+    <Content Include="Styles\workflows-activity-add-model-error.css" />
+    <Content Include="Styles\workflows-activity-dynamic-form-submitted.css" />
+    <Content Include="Styles\workflows-activity-dynamic-form-validating.css" />
+    <Content Include="Web.config" />
+    <Content Include="Scripts\Web.config" />
+    <Content Include="Styles\Web.config" />
+    <Content Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Module.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.AntiSpam\Orchard.AntiSpam.csproj">
+      <Project>{91bc2e7f-da04-421c-98ef-76d37cec130c}</Project>
+      <Name>Orchard.AntiSpam</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Fields\Orchard.Fields.csproj">
+      <Project>{3787dde5-e5c8-4841-bda7-dcb325388064}</Project>
+      <Name>Orchard.Fields</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
+      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
+      <Name>Orchard.Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Layouts\Orchard.Layouts.csproj">
+      <Project>{6bd8b2fa-f2e3-4ac8-a4c3-2925a653889a}</Project>
+      <Name>Orchard.Layouts</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Projections\Orchard.Projections.csproj">
+      <Project>{5531e894-d259-45a3-aa61-26dbe720c1ce}</Project>
+      <Name>Orchard.Projections</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Scripting.CSharp\Orchard.Scripting.CSharp.csproj">
+      <Project>{5d13ef34-8b39-4ec5-847f-e12892acf841}</Project>
+      <Name>Orchard.Scripting.CSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Taxonomies\Orchard.Taxonomies.csproj">
+      <Project>{e649ea64-d213-461b-87f7-d67035801443}</Project>
+      <Name>Orchard.Taxonomies</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
+      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
+      <Name>Orchard.Tokens</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Users\Orchard.Users.csproj">
+      <Project>{79aed36e-abd0-4747-93d3-8722b042454b}</Project>
+      <Name>Orchard.Users</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
+      <Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
+      <Name>Orchard.Workflows</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Activities\DynamicFormActivity.cs" />
+    <Compile Include="Activities\AddModelErrorActivity.cs" />
+    <Compile Include="Activities\DynamicFormValidatingActivity.cs" />
+    <Compile Include="Activities\DynamicFormSubmittedActivity.cs" />
+    <Compile Include="Bindings\BooleanFieldBindings.cs" />
+    <Compile Include="Bindings\EnumerationFieldBindings.cs" />
+    <Compile Include="Bindings\InputFieldBindings.cs" />
+    <Compile Include="Bindings\TaxonomyFieldBindings.cs" />
+    <Compile Include="Drivers\FieldsetElementDriver.cs" />
+    <Compile Include="Drivers\UrlFieldElementDriver.cs" />
+    <Compile Include="Elements\Fieldset.cs" />
+    <Compile Include="Elements\UrlField.cs" />
+    <Compile Include="Bindings\NumericFieldBindings.cs" />
+    <Compile Include="Forms\AddModelErrorForm.cs" />
+    <Compile Include="Forms\SelectDynamicForms.cs" />
+    <Compile Include="Bindings\TextFieldBindings.cs" />
+    <Compile Include="Bindings\BodyPartBindings.cs" />
+    <Compile Include="Bindings\UserPartBindings.cs" />
+    <Compile Include="Controllers\SubmissionAdminController.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Controllers\FormController.cs" />
+    <Compile Include="Drivers\EmailFieldElementDriver.cs" />
+    <Compile Include="Drivers\PasswordFieldElementDriver.cs" />
+    <Compile Include="Drivers\QueryElementDriver.cs" />
+    <Compile Include="Drivers\ReCaptchaElementDriver.cs" />
+    <Compile Include="Drivers\ValidationMessageElementDriver.cs" />
+    <Compile Include="Drivers\ValidationSummaryElementDriver.cs" />
+    <Compile Include="Elements\EmailField.cs" />
+    <Compile Include="Elements\PasswordField.cs" />
+    <Compile Include="Elements\Query.cs" />
+    <Compile Include="Elements\ReCaptcha.cs" />
+    <Compile Include="Elements\ValidationMessage.cs" />
+    <Compile Include="Elements\ValidationSummary.cs" />
+    <Compile Include="Forms\DynamicFormValidatingForm.cs" />
+    <Compile Include="Handlers\ClientValidationRegistrationCoordinator.cs" />
+    <Compile Include="Handlers\LayoutEditorShapeEventHandler.cs" />
+    <Compile Include="Handlers\WorkflowValidatorCoordinator.cs" />
+    <Compile Include="ResourceManifest.cs" />
+    <Compile Include="Services\FieldsetModelMap.cs" />
+    <Compile Include="Services\FormModelMap.cs" />
+    <Compile Include="Services\Models\FormSubmissionTokenContext.cs" />
+    <Compile Include="Handlers\ValidatorsCoordinator.cs" />
+    <Compile Include="Handlers\FormSubmissionCoordinator.cs" />
+    <Compile Include="Helpers\FormControllerExtensions.cs" />
+    <Compile Include="Helpers\FieldValidatorsExtensions.cs" />
+    <Compile Include="Helpers\StringExtensions.cs" />
+    <Compile Include="Services\ElementValidator.cs" />
+    <Compile Include="Services\FormEventHandlerBase.cs" />
+    <Compile Include="Services\IValidationRuleFactory.cs" />
+    <Compile Include="Services\ITempDataAccessor.cs" />
+    <Compile Include="Services\IElementValidator.cs" />
+    <Compile Include="Services\Models\RegisterClientValidationAttributesContext.cs" />
+    <Compile Include="Services\Models\ValidationContext.cs" />
+    <Compile Include="Services\ValidationRuleFactory.cs" />
+    <Compile Include="Services\IValidationRule.cs" />
+    <Compile Include="Tokens\FormTokens.cs" />
+    <Compile Include="ValidationRules\OptionRequired.cs" />
+    <Compile Include="ValidationRules\Mandatory.cs" />
+    <Compile Include="ValidationRules\Compare.cs" />
+    <Compile Include="ValidationRules\EmailAddress.cs" />
+    <Compile Include="ValidationRules\RegularExpression.cs" />
+    <Compile Include="ValidationRules\StringLength.cs" />
+    <Compile Include="ValidationRules\UrlAddress.cs" />
+    <Compile Include="Validators\QueryValidator.cs" />
+    <Compile Include="Validators\Settings\UrlFieldValidationSettings.cs" />
+    <Compile Include="Validators\TaxonomyValidator.cs" />
+    <Compile Include="Validators\EnumerationValidator.cs" />
+    <Compile Include="Validators\CheckBoxValidator.cs" />
+    <Compile Include="ValidationRules\Required.cs" />
+    <Compile Include="Services\ValidationRule.cs" />
+    <Compile Include="Validators\EmailFieldValidator.cs" />
+    <Compile Include="Validators\Settings\EnumerationValidationSettings.cs" />
+    <Compile Include="Validators\Settings\CheckBoxValidationSettings.cs" />
+    <Compile Include="Validators\Settings\EmailFieldValidationSettings.cs" />
+    <Compile Include="Validators\Settings\PasswordFieldValidationSettings.cs" />
+    <Compile Include="Validators\Settings\ReCaptchaValidationSettings.cs" />
+    <Compile Include="Validators\Settings\TextAreaValidationSettings.cs" />
+    <Compile Include="Validators\Settings\TextFieldValidationSettings.cs" />
+    <Compile Include="Services\Models\ValidationSettingsBase.cs" />
+    <Compile Include="Services\Models\FormEventContext.cs" />
+    <Compile Include="Drivers\ValidationElementDriver.cs" />
+    <Compile Include="Drivers\BindingsElementDriver.cs" />
+    <Compile Include="Drivers\TaxonomyElementDriver.cs" />
+    <Compile Include="Drivers\HiddenFieldElementDriver.cs" />
+    <Compile Include="Drivers\CheckboxElementDriver.cs" />
+    <Compile Include="Drivers\TextAreaElementDriver.cs" />
+    <Compile Include="Drivers\RadioButtonElementDriver.cs" />
+    <Compile Include="Drivers\EnumerationElementDriver.cs" />
+    <Compile Include="Drivers\UserNameFieldElementDriver.cs" />
+    <Compile Include="Elements\LabeledFormElement.cs" />
+    <Compile Include="Elements\Taxonomy.cs" />
+    <Compile Include="Elements\HiddenField.cs" />
+    <Compile Include="Elements\Checkbox.cs" />
+    <Compile Include="Elements\RadioButton.cs" />
+    <Compile Include="Elements\TextArea.cs" />
+    <Compile Include="Elements\Enumeration.cs" />
+    <Compile Include="Elements\UserNameField.cs" />
+    <Compile Include="Forms\AutoLabelForm.cs" />
+    <Compile Include="Handlers\UserNameFieldHandler.cs" />
+    <Compile Include="Helpers\StreamExtensions.cs" />
+    <Compile Include="Helpers\DataTableExtensions.cs" />
+    <Compile Include="Helpers\TokenizerExtensions.cs" />
+    <Compile Include="Recipes\Builders\FormSubmissionsStep.cs" />
+    <Compile Include="Recipes\Executors\FormSubmissionsStep.cs" />
+    <Compile Include="Services\IDynamicFormEventHandler.cs" />
+    <Compile Include="Services\Models\FieldValidatorDescriptor.cs" />
+    <Compile Include="Services\Models\FormSubmittedEventContext.cs" />
+    <Compile Include="Services\Models\FormValidatedEventContext.cs" />
+    <Compile Include="Services\Models\FormValidatingEventContext.cs" />
+    <Compile Include="Services\Models\BindingDescriptor.cs" />
+    <Compile Include="Services\Models\ContentFieldBindingDescriptor.cs" />
+    <Compile Include="Services\Models\ContentPartBindingDescriptor.cs" />
+    <Compile Include="Services\Models\ValidateInputContext.cs" />
+    <Compile Include="Validators\PasswordFieldValidator.cs" />
+    <Compile Include="Validators\ReCaptchaValidator.cs" />
+    <Compile Include="Validators\TextAreaValidator.cs" />
+    <Compile Include="Validators\TextFieldValidator.cs" />
+    <Compile Include="Validators\UrlFieldValidator.cs" />
+    <Compile Include="ViewModels\FieldValidationSettings.cs" />
+    <Compile Include="ViewModels\FormBindingSettings.cs" />
+    <Compile Include="Helpers\ContentTypeDefinitionExtensions.cs" />
+    <Compile Include="Services\BindingManager.cs" />
+    <Compile Include="Services\IBindingManager.cs" />
+    <Compile Include="Services\IBindingProvider.cs" />
+    <Compile Include="Services\Models\BindingDescribeContext.cs" />
+    <Compile Include="Services\Models\BindingContext.cs" />
+    <Compile Include="Bindings\TitlePartBindings.cs" />
+    <Compile Include="ViewModels\BindingSettings.cs" />
+    <Compile Include="ViewModels\FieldBindingSettings.cs" />
+    <Compile Include="ViewModels\PartBindingSettings.cs" />
+    <Compile Include="ViewModels\BlueprintsIndexViewModel.cs" />
+    <Compile Include="ViewModels\ReCaptchaElementViewModel.cs" />
+    <Compile Include="ViewModels\SubmissionViewModel.cs" />
+    <Compile Include="ViewModels\SubmissionsIndexViewModel.cs" />
+    <Compile Include="Helpers\SubmissionExtensions.cs" />
+    <Compile Include="ViewModels\FormsIndexViewModel.cs" />
+    <Compile Include="Drivers\CommonFormElementDriver.cs" />
+    <Compile Include="Drivers\FormElementDriver.cs" />
+    <Compile Include="Drivers\ButtonElementDriver.cs" />
+    <Compile Include="Drivers\IpAddressFieldElementDriver.cs" />
+    <Compile Include="Elements\IpAddressField.cs" />
+    <Compile Include="Handlers\IpAddressFieldHandler.cs" />
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Handlers\ReadFormValuesHandler.cs" />
+    <Compile Include="Services\FormElementEventHandlerBase.cs" />
+    <Compile Include="Helpers\NameValueCollectionExtensions.cs" />
+    <Compile Include="Models\Submission.cs" />
+    <Compile Include="Permissions.cs" />
+    <Compile Include="Services\FormService.cs" />
+    <Compile Include="Services\IFormElementEventHandler.cs" />
+    <Compile Include="Services\IFormService.cs" />
+    <Compile Include="Drivers\LabelElementDriver.cs" />
+    <Compile Include="Drivers\TextFieldElementDriver.cs" />
+    <Compile Include="Elements\FormCategoryProvider.cs" />
+    <Compile Include="Elements\FormElement.cs" />
+    <Compile Include="Elements\Form.cs" />
+    <Compile Include="Elements\Button.cs" />
+    <Compile Include="Elements\Label.cs" />
+    <Compile Include="Elements\TextField.cs" />
+    <Compile Include="Services\ReadElementValuesContext.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\SubmissionAdmin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\TextField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Button.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Form.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Label.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\TextField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\IpAddressField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\IpAddressField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\SubmissionAdmin\Details.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\FormBindings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\UserNameField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\UserNameField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\HiddenField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\HiddenField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\TextArea.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\TextArea.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\RadioButton.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\RadioButton.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Checkbox.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Checkbox.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-SelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-MultiSelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-RadioList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-CheckList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-SelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-RadioList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-MultiSelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-CheckList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-DynamicFormSubmitted.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\BlueprintAdmin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\ValidationSummary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\ValidationSummary.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\ValidationMessage.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\ValidationMessage.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\FormElement.Wrapper.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\PasswordField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\PasswordField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-SelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-CheckList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-MultiSelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-RadioList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\EmailField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\EmailField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\ReCaptcha.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\ReCaptcha.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\LayoutEditor.Template.Form.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-RadioList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-CheckList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-SelectList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Enumeration-MultiSelectList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-CheckList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-MultiSelectList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-RadioList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Taxonomy-SelectList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-CheckList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-MultiSelectList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-RadioList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Query-SelectList.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Fieldset.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\LayoutEditor.Template.Fieldset.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Button.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\Label.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\UrlField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\UrlField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </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="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.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" DependsOnTargets="AfterBuildCompiler">
+    <PropertyGroup>
+      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
+    </PropertyGroup>
+    <!-- If this is an area child project, uncomment the following line:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    -->
+    <!-- If this is an area parent project, uncomment the following lines:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
+    -->
+  </Target>
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</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.DynamicForms/packages.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
index b478991b3..4d42619bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
@@ -49,9 +49,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration">
@@ -135,7 +135,9 @@
   <ItemGroup>
     <Content Include="Views\Template.Smtp.Wrapper.cshtml" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Orchard.Web/Modules/Orchard.Email/packages.config b/src/Orchard.Web/Modules/Orchard.Email/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Email/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
index 451e2f063..11482f9e5 100644
--- a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
@@ -50,8 +50,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -111,6 +112,9 @@
   <ItemGroup>
     <Folder Include="Views\" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Orchard.Web/Modules/Orchard.Forms/packages.config b/src/Orchard.Web/Modules/Orchard.Forms/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Forms/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj
index 2a0c14a30..8d9f8d25e 100644
--- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj
+++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj
@@ -1,177 +1,179 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>{085948FF-0E9B-4A9A-B564-F8B8B4BDDDBC}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.JobsQueue</RootNamespace>
-    <AssemblyName>Orchard.JobsQueue</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc, Version=3.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" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Services\IJobsQueueProcessor.cs" />
-    <Compile Include="Services\IJobsQueueManager.cs" />
-    <Compile Include="Services\IJobsQueueService.cs" />
-    <Compile Include="Drivers\JobsQueueSettingsPartDriver.cs" />
-    <Compile Include="Handlers\JobsQueueSettingsPartHandler.cs" />
-    <Compile Include="Migrations.cs" />
-    <Compile Include="Services\JobsQueueProcessor.cs" />
-    <Compile Include="Services\JobsQueueBackgroundTask.cs" />
-    <Compile Include="Models\JobsQueueStatus.cs" />
-    <Compile Include="Models\QueuedJobRecord.cs" />
-    <Compile Include="Models\JobsQueueSettingsPart.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\JobsQueueManager.cs" />
-    <Compile Include="Services\JobsQueueService.cs" />
-    <Compile Include="ViewModels\QueuedJobsSettingsPartViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Module.txt" />
-    <Content Include="Placement.info" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Styles\Images\menu.jobsqueue.png" />
-    <Content Include="Styles\Images\queue-controls.png" />
-    <Content Include="Styles\admin-jobsqueue.css" />
-    <Content Include="Styles\menu.jobsqueue-admin.css" />
-    <Content Include="Styles\workflows-activity-sendmessage.css" />
-    <Content Include="Views\EditorTemplates\Parts\JobsQueueSettings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
-      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
-      <Name>Orchard.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.TaskLease\Orchard.TaskLease.csproj">
-      <Project>{3F72A4E9-7B72-4260-B010-C16EC54F9BAF}</Project>
-      <Name>Orchard.TaskLease</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
-      <Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
-      <Name>Orchard.Workflows</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Details.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Styles\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scripts\Web.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\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" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>29609</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- 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">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>{085948FF-0E9B-4A9A-B564-F8B8B4BDDDBC}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.JobsQueue</RootNamespace>
+    <AssemblyName>Orchard.JobsQueue</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+  </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>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=3.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" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Services\IJobsQueueProcessor.cs" />
+    <Compile Include="Services\IJobsQueueManager.cs" />
+    <Compile Include="Services\IJobsQueueService.cs" />
+    <Compile Include="Drivers\JobsQueueSettingsPartDriver.cs" />
+    <Compile Include="Handlers\JobsQueueSettingsPartHandler.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Services\JobsQueueProcessor.cs" />
+    <Compile Include="Services\JobsQueueBackgroundTask.cs" />
+    <Compile Include="Models\JobsQueueStatus.cs" />
+    <Compile Include="Models\QueuedJobRecord.cs" />
+    <Compile Include="Models\JobsQueueSettingsPart.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\JobsQueueManager.cs" />
+    <Compile Include="Services\JobsQueueService.cs" />
+    <Compile Include="ViewModels\QueuedJobsSettingsPartViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Module.txt" />
+    <Content Include="Placement.info" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Images\menu.jobsqueue.png" />
+    <Content Include="Styles\Images\queue-controls.png" />
+    <Content Include="Styles\admin-jobsqueue.css" />
+    <Content Include="Styles\menu.jobsqueue-admin.css" />
+    <Content Include="Styles\workflows-activity-sendmessage.css" />
+    <Content Include="Views\EditorTemplates\Parts\JobsQueueSettings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
+      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
+      <Name>Orchard.Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.TaskLease\Orchard.TaskLease.csproj">
+      <Project>{3F72A4E9-7B72-4260-B010-C16EC54F9BAF}</Project>
+      <Name>Orchard.TaskLease</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
+      <Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
+      <Name>Orchard.Workflows</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\List.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Details.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\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" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>29609</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- 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">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
index da26ddba4..3253d3481 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
@@ -49,9 +49,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -543,7 +543,9 @@
   <ItemGroup>
     <Content Include="Views\Elements\Heading.Design.cshtml" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Elements\PlaceableContentItem.cshtml" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
index 788aa1a3a..364451aca 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
@@ -1,426 +1,429 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{73A7688A-5BD3-4F7E-ADFA-CE36C5A10E3B}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.MediaLibrary</RootNamespace>
-    <AssemblyName>Orchard.MediaLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scripts\media-library-picker.js" />
-    <Content Include="Scripts\media-library.js" />
-    <Content Include="Scripts\modal-window.js" />
-    <Content Include="Styles\Images\menu.media.png" />
-    <Content Include="Styles\menu.media-library-admin.css" />
-    <Content Include="Styles\menu.oembed-mediaproviders.css" />
-    <Content Include="Styles\orchard-oembed-admin.css" />
-    <Content Include="Styles\menu.websearch-mediaproviders.css" />
-    <Content Include="Styles\menu.clientstorage-mediaproviders.css" />
-    <Content Include="Styles\dialog-mode.css" />
-    <Content Include="Styles\media-library-picker-admin.css" />
-    <Content Include="Styles\Images\folders-loader.gif" />
-    <Content Include="Styles\Images\loading.gif" />
-    <Content Include="Styles\Images\processing.gif" />
-    <Content Include="Styles\orchard-clientstorage-admin.css" />
-    <Content Include="Styles\Images\ajax-loader.gif" />
-    <Content Include="Styles\orchard-websearch-admin.css" />
-    <Content Include="Styles\orchard-mediaproviders-admin.css" />
-    <Content Include="Styles\orchard-medialibrary-admin.css" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Scripts\Web.config" />
-    <Content Include="Styles\Web.config" />
-    <Compile Include="Drivers\VectorImagePartDriver.cs" />
-    <Compile Include="Factories\VectorImageFactory.cs" />
-    <Compile Include="Handlers\MediaLibrarySettingsPartHandler.cs" />
-    <Compile Include="Models\MediaLibrarySettingsPart.cs" />
-    <Compile Include="Models\VectorImagePart.cs" />
-    <Compile Include="Models\IMediaFolder.cs" />
-    <Compile Include="MediaFileName\MediaFileNameDriver.cs" />
-    <Compile Include="MediaFileName\MediaFileNameEditorSettings.cs" />
-    <Compile Include="MediaFileName\MediaFileNameEditorViewModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Content Include="Module.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
-      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
-      <Name>Orchard.Tokens</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Drivers\MediaLibraryExplorerPartDriver.cs" />
-    <Compile Include="ModalAdminFilter.cs" />
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Controllers\ClientStorageController.cs" />
-    <Compile Include="Controllers\OEmbedController.cs" />
-    <Compile Include="Controllers\FolderController.cs" />
-    <Compile Include="Controllers\WebSearchController.cs" />
-    <Compile Include="Drivers\AudioPartDriver.cs" />
-    <Compile Include="Drivers\OEmbedPartDriver.cs" />
-    <Compile Include="Drivers\MediaLibraryPickerFieldDriver.cs" />
-    <Compile Include="Drivers\DocumentPartDriver.cs" />
-    <Compile Include="Drivers\VideoPartDriver.cs" />
-    <Compile Include="Drivers\ImagePartDriver.cs" />
-    <Compile Include="Factories\AudioFactory.cs" />
-    <Compile Include="Factories\DocumentFactory.cs" />
-    <Compile Include="Factories\VideoFactory.cs" />
-    <Compile Include="Factories\ImageFactory.cs" />
-    <Compile Include="Factories\IMediaFactory.cs" />
-    <Compile Include="Factories\IMediaFactorySelector.cs" />
-    <Compile Include="Factories\MediaFactorySelectorResult.cs" />
-    <Compile Include="Fields\MediaLibraryPickerField.cs" />
-    <Compile Include="Handlers\MediaLibraryPickerFieldHandler.cs" />
-    <Compile Include="Handlers\MediaPartHandler.cs" />
-    <Compile Include="Drivers\MediaPartDriver.cs" />
-    <Compile Include="Handlers\WebSearchSettingsPartHandler.cs" />
-    <Compile Include="Migrations.cs" />
-    <Compile Include="Models\AudioPart.cs" />
-    <Compile Include="Models\FolderHierarchy.cs" />
-    <Compile Include="Models\MediaFile.cs" />
-    <Compile Include="Models\MediaFolder.cs" />
-    <Compile Include="Models\MediaLibraryExplorerPart.cs" />
-    <Compile Include="Models\WebSearchSettingsPart.cs" />
-    <Compile Include="Models\ImagePart.cs" />
-    <Compile Include="Models\DocumentPart.cs" />
-    <Compile Include="Models\VideoPart.cs" />
-    <Compile Include="Models\OEmbedPart.cs" />
-    <Compile Include="Models\MediaPart.cs" />
-    <Compile Include="Models\MediaPartRecord.cs" />
-    <Compile Include="Permissions.cs" />
-    <Compile Include="Providers\ClientStorageMenu.cs" />
-    <Compile Include="Providers\OEmbedMenu.cs" />
-    <Compile Include="Providers\WebSearchMenu.cs" />
-    <Compile Include="ResourceManifest.cs" />
-    <Compile Include="Security\MediaAuthorizationEventHandler.cs" />
-    <Compile Include="Services\IMediaLibraryService.cs" />
-    <Compile Include="Services\MediaLibraryService.cs" />
-    <Compile Include="Services\Shapes.cs" />
-    <Compile Include="Services\XmlRpcHandler.cs" />
-    <Compile Include="Settings\MediaLibraryPickerFieldEditorEvents.cs" />
-    <Compile Include="Settings\MediaLibraryPickerFieldSettings.cs" />
-    <Compile Include="Tokens\FieldTokens.cs" />
-    <Compile Include="ViewModels\MediaManagerChildFoldersViewModel.cs" />
-    <Compile Include="ViewModels\ImportMediaViewModel.cs" />
-    <Compile Include="ViewModels\MediaLibraryPickerFieldViewModel.cs" />
-    <Compile Include="ViewModels\MediaManagerMediaItemsViewModel.cs" />
-    <Compile Include="ViewModels\MediaManagerFolderCreateViewModel.cs" />
-    <Compile Include="ViewModels\MediaManagerFolderEditViewModel.cs" />
-    <Compile Include="ViewModels\MediaManagerImportViewModel.cs" />
-    <Compile Include="ViewModels\MediaManagerIndexViewModel.cs" />
-    <Compile Include="ViewModels\OEmbedViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media.Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ClientStorage\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Import.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\WebSearch\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Folder\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Folder\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media-Image.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\MediaItems.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media-Video.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Media.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Placement.info">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Parts.Media.Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Image.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Image.Metadata.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Media.Actions.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Video.Metadata.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Video.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media-Audio.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media-Document.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Audio.Metadata.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Audio.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Document.Metadata.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Document.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\DefinitionTemplates\MediaLibraryPickerFieldSettings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Fields\MediaLibraryPicker.Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Fields\MediaLibraryPicker.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Fields\MediaLibraryPicker.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Audio.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Document.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Image.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Video.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Audio.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Document.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Image.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Video.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\OEmbed\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\OEmbed.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\OEmbed.Metadata.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\OEmbed.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\OEmbed.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media-OEmbed.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Parts\WebSearch.WebSearchSettings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media.Raw.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\MediaLibrary.Actions.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\MediaLibrary.Navigation.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Fields\MediaLibraryPicker.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\ChildFolders.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\MediaLibraryPicker.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\DefinitionTemplates\MediaFileNameEditorSettings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\Media.Edit.FileName.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\VectorImage.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\VectorImage.Metadata.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\VectorImage.Summary.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts\VectorImage.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media-VectorImage.Thumbnail.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EditorTemplates\Parts\MediaLibrary.MediaLibrarySettings.cshtml" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Styles\orchard-medialibrary-admin.css</ApplicationManifest>
-  </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" DependsOnTargets="AfterBuildCompiler">
-    <PropertyGroup>
-      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
-    </PropertyGroup>
-    <!-- If this is an area child project, uncomment the following line:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    -->
-    <!-- If this is an area parent project, uncomment the following lines:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-    -->
-  </Target>
-  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>45979</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{73A7688A-5BD3-4F7E-ADFA-CE36C5A10E3B}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.MediaLibrary</RootNamespace>
+    <AssemblyName>Orchard.MediaLibrary</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\media-library-picker.js" />
+    <Content Include="Scripts\media-library.js" />
+    <Content Include="Scripts\modal-window.js" />
+    <Content Include="Styles\Images\menu.media.png" />
+    <Content Include="Styles\menu.media-library-admin.css" />
+    <Content Include="Styles\menu.oembed-mediaproviders.css" />
+    <Content Include="Styles\orchard-oembed-admin.css" />
+    <Content Include="Styles\menu.websearch-mediaproviders.css" />
+    <Content Include="Styles\menu.clientstorage-mediaproviders.css" />
+    <Content Include="Styles\dialog-mode.css" />
+    <Content Include="Styles\media-library-picker-admin.css" />
+    <Content Include="Styles\Images\folders-loader.gif" />
+    <Content Include="Styles\Images\loading.gif" />
+    <Content Include="Styles\Images\processing.gif" />
+    <Content Include="Styles\orchard-clientstorage-admin.css" />
+    <Content Include="Styles\Images\ajax-loader.gif" />
+    <Content Include="Styles\orchard-websearch-admin.css" />
+    <Content Include="Styles\orchard-mediaproviders-admin.css" />
+    <Content Include="Styles\orchard-medialibrary-admin.css" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Scripts\Web.config" />
+    <Content Include="Styles\Web.config" />
+    <Compile Include="Drivers\VectorImagePartDriver.cs" />
+    <Compile Include="Factories\VectorImageFactory.cs" />
+    <Compile Include="Handlers\MediaLibrarySettingsPartHandler.cs" />
+    <Compile Include="Models\MediaLibrarySettingsPart.cs" />
+    <Compile Include="Models\VectorImagePart.cs" />
+    <Compile Include="Models\IMediaFolder.cs" />
+    <Compile Include="MediaFileName\MediaFileNameDriver.cs" />
+    <Compile Include="MediaFileName\MediaFileNameEditorSettings.cs" />
+    <Compile Include="MediaFileName\MediaFileNameEditorViewModel.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Module.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
+      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
+      <Name>Orchard.Tokens</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Drivers\MediaLibraryExplorerPartDriver.cs" />
+    <Compile Include="ModalAdminFilter.cs" />
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Controllers\ClientStorageController.cs" />
+    <Compile Include="Controllers\OEmbedController.cs" />
+    <Compile Include="Controllers\FolderController.cs" />
+    <Compile Include="Controllers\WebSearchController.cs" />
+    <Compile Include="Drivers\AudioPartDriver.cs" />
+    <Compile Include="Drivers\OEmbedPartDriver.cs" />
+    <Compile Include="Drivers\MediaLibraryPickerFieldDriver.cs" />
+    <Compile Include="Drivers\DocumentPartDriver.cs" />
+    <Compile Include="Drivers\VideoPartDriver.cs" />
+    <Compile Include="Drivers\ImagePartDriver.cs" />
+    <Compile Include="Factories\AudioFactory.cs" />
+    <Compile Include="Factories\DocumentFactory.cs" />
+    <Compile Include="Factories\VideoFactory.cs" />
+    <Compile Include="Factories\ImageFactory.cs" />
+    <Compile Include="Factories\IMediaFactory.cs" />
+    <Compile Include="Factories\IMediaFactorySelector.cs" />
+    <Compile Include="Factories\MediaFactorySelectorResult.cs" />
+    <Compile Include="Fields\MediaLibraryPickerField.cs" />
+    <Compile Include="Handlers\MediaLibraryPickerFieldHandler.cs" />
+    <Compile Include="Handlers\MediaPartHandler.cs" />
+    <Compile Include="Drivers\MediaPartDriver.cs" />
+    <Compile Include="Handlers\WebSearchSettingsPartHandler.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Models\AudioPart.cs" />
+    <Compile Include="Models\FolderHierarchy.cs" />
+    <Compile Include="Models\MediaFile.cs" />
+    <Compile Include="Models\MediaFolder.cs" />
+    <Compile Include="Models\MediaLibraryExplorerPart.cs" />
+    <Compile Include="Models\WebSearchSettingsPart.cs" />
+    <Compile Include="Models\ImagePart.cs" />
+    <Compile Include="Models\DocumentPart.cs" />
+    <Compile Include="Models\VideoPart.cs" />
+    <Compile Include="Models\OEmbedPart.cs" />
+    <Compile Include="Models\MediaPart.cs" />
+    <Compile Include="Models\MediaPartRecord.cs" />
+    <Compile Include="Permissions.cs" />
+    <Compile Include="Providers\ClientStorageMenu.cs" />
+    <Compile Include="Providers\OEmbedMenu.cs" />
+    <Compile Include="Providers\WebSearchMenu.cs" />
+    <Compile Include="ResourceManifest.cs" />
+    <Compile Include="Security\MediaAuthorizationEventHandler.cs" />
+    <Compile Include="Services\IMediaLibraryService.cs" />
+    <Compile Include="Services\MediaLibraryService.cs" />
+    <Compile Include="Services\Shapes.cs" />
+    <Compile Include="Services\XmlRpcHandler.cs" />
+    <Compile Include="Settings\MediaLibraryPickerFieldEditorEvents.cs" />
+    <Compile Include="Settings\MediaLibraryPickerFieldSettings.cs" />
+    <Compile Include="Tokens\FieldTokens.cs" />
+    <Compile Include="ViewModels\MediaManagerChildFoldersViewModel.cs" />
+    <Compile Include="ViewModels\ImportMediaViewModel.cs" />
+    <Compile Include="ViewModels\MediaLibraryPickerFieldViewModel.cs" />
+    <Compile Include="ViewModels\MediaManagerMediaItemsViewModel.cs" />
+    <Compile Include="ViewModels\MediaManagerFolderCreateViewModel.cs" />
+    <Compile Include="ViewModels\MediaManagerFolderEditViewModel.cs" />
+    <Compile Include="ViewModels\MediaManagerImportViewModel.cs" />
+    <Compile Include="ViewModels\MediaManagerIndexViewModel.cs" />
+    <Compile Include="ViewModels\OEmbedViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media.Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\ClientStorage\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Import.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\WebSearch\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Folder\Create.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Folder\Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media-Image.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\MediaItems.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media-Video.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Media.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Placement.info">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts.Media.Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Image.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Image.Metadata.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Media.Actions.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Video.Metadata.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Video.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media-Audio.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media-Document.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Audio.Metadata.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Audio.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Document.Metadata.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Document.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\DefinitionTemplates\MediaLibraryPickerFieldSettings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Fields\MediaLibraryPicker.Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Fields\MediaLibraryPicker.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Fields\MediaLibraryPicker.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Audio.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Document.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Image.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Video.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Audio.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Document.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Image.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Video.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\OEmbed\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\OEmbed.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\OEmbed.Metadata.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\OEmbed.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\OEmbed.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media-OEmbed.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts\WebSearch.WebSearchSettings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media.Raw.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\MediaLibrary.Actions.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\MediaLibrary.Navigation.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Fields\MediaLibraryPicker.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\ChildFolders.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\MediaLibraryPicker.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\DefinitionTemplates\MediaFileNameEditorSettings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\Media.Edit.FileName.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\VectorImage.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\VectorImage.Metadata.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\VectorImage.Summary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts\VectorImage.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Media-VectorImage.Thumbnail.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts\MediaLibrary.MediaLibrarySettings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Styles\orchard-medialibrary-admin.css</ApplicationManifest>
+  </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" DependsOnTargets="AfterBuildCompiler">
+    <PropertyGroup>
+      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
+    </PropertyGroup>
+    <!-- If this is an area child project, uncomment the following line:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    -->
+    <!-- If this is an area parent project, uncomment the following lines:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
+    -->
+  </Target>
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</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.MediaLibrary/packages.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj
index 5371fefc1..42d8877a0 100644
--- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj
@@ -1,163 +1,167 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Redis</RootNamespace>
-    <AssemblyName>Orchard.Redis</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\nhibernate\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="StackExchange.Redis">
-      <HintPath>..\..\..\..\lib\redis\StackExchange.Redis.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-    <Content Include="Properties\AssemblyInfo.cs" />
-    <Content Include="Module.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Caching\Orchard.Caching.csproj">
-      <Project>{7528BF74-25C7-4ABE-883A-443B4EEC4776}</Project>
-      <Name>Orchard.Caching</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.MessageBus\Orchard.MessageBus.csproj">
-      <Project>{ed715544-e649-4f48-b8ee-9368c41c3ac0}</Project>
-      <Name>Orchard.MessageBus</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.OutputCache\Orchard.OutputCache.csproj">
-      <Project>{6e444ff1-a47c-4cf6-bb3f-507c8ebd776d}</Project>
-      <Name>Orchard.OutputCache</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Caching\RedisCacheStorageProvider.cs" />
-    <Compile Include="Extensions\RedisDatabaseExtensions.cs" />
-    <Compile Include="Configuration\IRedisConnectionProvider.cs" />
-    <Compile Include="Configuration\RedisConnectionProvider.cs" />
-    <Compile Include="MessageBus\RedisMessageBusBroker.cs" />
-    <Compile Include="OutputCache\RedisOutputCacheStorageProvider.cs" />
-    <Compile Include="OutputCache\RedisTagCache.cs" />
-  </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" DependsOnTargets="AfterBuildCompiler">
-    <PropertyGroup>
-      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
-    </PropertyGroup>
-    <!-- If this is an area child project, uncomment the following line:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    -->
-    <!-- If this is an area parent project, uncomment the following lines:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-    -->
-  </Target>
-  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>45979</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.Redis</RootNamespace>
+    <AssemblyName>Orchard.Redis</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\nhibernate\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="StackExchange.Redis">
+      <HintPath>..\..\..\..\lib\redis\StackExchange.Redis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Web.config" />
+    <Content Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Module.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Caching\Orchard.Caching.csproj">
+      <Project>{7528BF74-25C7-4ABE-883A-443B4EEC4776}</Project>
+      <Name>Orchard.Caching</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.MessageBus\Orchard.MessageBus.csproj">
+      <Project>{ed715544-e649-4f48-b8ee-9368c41c3ac0}</Project>
+      <Name>Orchard.MessageBus</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.OutputCache\Orchard.OutputCache.csproj">
+      <Project>{6e444ff1-a47c-4cf6-bb3f-507c8ebd776d}</Project>
+      <Name>Orchard.OutputCache</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Caching\RedisCacheStorageProvider.cs" />
+    <Compile Include="Extensions\RedisDatabaseExtensions.cs" />
+    <Compile Include="Configuration\IRedisConnectionProvider.cs" />
+    <Compile Include="Configuration\RedisConnectionProvider.cs" />
+    <Compile Include="MessageBus\RedisMessageBusBroker.cs" />
+    <Compile Include="OutputCache\RedisOutputCacheStorageProvider.cs" />
+    <Compile Include="OutputCache\RedisTagCache.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </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" DependsOnTargets="AfterBuildCompiler">
+    <PropertyGroup>
+      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
+    </PropertyGroup>
+    <!-- If this is an area child project, uncomment the following line:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    -->
+    <!-- If this is an area parent project, uncomment the following lines:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
+    -->
+  </Target>
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</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.Redis/packages.config b/src/Orchard.Web/Modules/Orchard.Redis/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Redis/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ 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 b3725af1a..70fc21ef0 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
@@ -1,259 +1,263 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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.5.1</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>false</UseIISExpress>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <TargetFrameworkProfile />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetwebapi\System.Web.Http.dll</HintPath>
-    </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.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="ViewModels\Tag.cs" />
-    <Compile Include="Controllers\TagsController.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\ITermCountProcessor.cs" />
-    <Compile Include="Services\TaxonomyService.cs" />
-    <Compile Include="Services\TermCountProcessor.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="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>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </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>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <UseIISExpress>false</UseIISExpress>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <TargetFrameworkProfile />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+  </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>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetwebapi\System.Web.Http.dll</HintPath>
+    </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.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="ViewModels\Tag.cs" />
+    <Compile Include="Controllers\TagsController.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\ITermCountProcessor.cs" />
+    <Compile Include="Services\TaxonomyService.cs" />
+    <Compile Include="Services\TermCountProcessor.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="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>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </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>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </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/packages.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
index 596e5c67f..fe4d8a6ed 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
@@ -1,281 +1,284 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7059493C-8251-4764-9C1E-2368B8B485BC}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Workflows</RootNamespace>
-    <AssemblyName>Orchard.Workflows</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </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>
-    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scripts\jquery.jsPlumb-1.4.1-all-min.js" />
-    <Content Include="Scripts\orchard-workflows-serialize.js" />
-    <Content Include="Scripts\orchard-workflows.js" />
-    <Content Include="Styles\workflows-activity-logging.css" />
-    <Content Include="Styles\workflows-activity-trigger.css" />
-    <Content Include="Styles\workflows-activity-signal.css" />
-    <Content Include="Styles\workflows-activity-web-request.css" />
-    <Content Include="Styles\workflows-activity-redirect.css" />
-    <Content Include="Styles\workflows-activity-merge-branch.css" />
-    <Content Include="Styles\workflows-activity-exclusive-branch.css" />
-    <Content Include="Styles\workflows-activity-content-delete.css" />
-    <Content Include="Styles\workflows-activity-content-updated.css" />
-    <Content Include="Styles\images\menu.workflows.png" />
-    <Content Include="Styles\menu.workflows-admin.css" />
-    <Content Include="Styles\workflows-activity.css" />
-    <Content Include="Styles\images\cog.png" />
-    <Content Include="Styles\workflows-activity-delete.css" />
-    <Content Include="Styles\workflows-activity-timer.css" />
-    <Content Include="Styles\workflows-activity-branch.css" />
-    <Content Include="Styles\orchard-workflows-admin.css" />
-    <Content Include="Styles\workflows-activity-notify.css" />
-    <Content Include="Styles\workflows-activity-publish.css" />
-    <Content Include="Styles\workflows-activity-content-removed.css" />
-    <Content Include="Styles\workflows-activity-content-published.css" />
-    <Content Include="Styles\workflows-activity-content-versioned.css" />
-    <Content Include="Styles\workflows-activity-content-created.css" />
-    <Content Include="Web.config" />
-    <Content Include="Scripts\Web.config" />
-    <Content Include="Styles\Web.config" />
-    <Compile Include="Activities\LoggingActivity.cs" />
-    <Compile Include="Forms\LoggingActivityForms.cs" />
-    <Compile Include="Helpers\OutcomeSerializerExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Content Include="Module.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
-      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
-      <Name>Orchard.Core</Name>
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
-      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
-      <Name>Orchard.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
-      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
-      <Name>Orchard.Tokens</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Activities\ContentActivity.cs" />
-    <Compile Include="Activities\BranchActivity.cs" />
-    <Compile Include="Activities\TriggerActivity.cs" />
-    <Compile Include="Activities\SignalActivity.cs" />
-    <Compile Include="Activities\MergeBranchActivity.cs" />
-    <Compile Include="Activities\DeleteActivity.cs" />
-    <Compile Include="Activities\ExclusiveBranchActivity.cs" />
-    <Compile Include="Activities\RedirectActivity.cs" />
-    <Compile Include="Activities\TimerActivity.cs" />
-    <Compile Include="Activities\WebRequestActivity.cs" />
-    <Compile Include="Controllers\SignalController.cs" />
-    <Compile Include="Forms\SignalForms.cs" />
-    <Compile Include="Forms\RedirectActionForm.cs" />
-    <Compile Include="Forms\TimerForms.cs" />
-    <Compile Include="Forms\BranchForms.cs" />
-    <Compile Include="Activities\PublishActivity.cs" />
-    <Compile Include="Activities\NotificationActivity.cs" />
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Drivers\WorkflowDriver.cs" />
-    <Compile Include="Forms\WebRequestForm.cs" />
-    <Compile Include="Handlers\WorkflowContentHandler.cs" />
-    <Compile Include="Handlers\WorkflowHandler.cs" />
-    <Compile Include="Recipes\Builders\WorkflowsStep.cs" />
-    <Compile Include="Recipes\Executors\WorkflowsStep.cs" />
-    <Compile Include="Models\AwaitingActivityRecord.cs" />
-    <Compile Include="Models\CancellationToken.cs" />
-    <Compile Include="Models\ActivityContext.cs" />
-    <Compile Include="Models\WorkflowContext.cs" />
-    <Compile Include="Models\ActivityRecord.cs" />
-    <Compile Include="Models\TransitionRecord.cs" />
-    <Compile Include="Models\WorkflowRecord.cs" />
-    <Compile Include="Migrations.cs" />
-    <Compile Include="Models\WorkflowDefinitionRecord.cs" />
-    <Compile Include="Forms\ContentActivityForms.cs" />
-    <Compile Include="Forms\NotificationActivityForms.cs" />
-    <Compile Include="ResourceManifest.cs" />
-    <Compile Include="Services\GenericEventService.cs" />
-    <Compile Include="Services\ISignalService.cs" />
-    <Compile Include="Services\Task.cs" />
-    <Compile Include="Services\Event.cs" />
-    <Compile Include="Services\IActivity.cs" />
-    <Compile Include="Services\ActivitiesManager.cs" />
-    <Compile Include="Services\IActivitiesManager.cs" />
-    <Compile Include="Services\IWorkflowManager.cs" />
-    <Compile Include="Services\WorkflowManager.cs" />
-    <Compile Include="Tokens\SignalTokens.cs" />
-    <Compile Include="Tokens\StateTokens.cs" />
-    <Compile Include="ViewModels\AdminEditViewModel.cs" />
-    <Compile Include="ViewModels\AdminIndexViewModel.cs" />
-    <Compile Include="ViewModels\WorkflowDefinitionViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Placement.info" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\EditActivity.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ActivityToolbox.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-Notify.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Parts.Workflow.SummaryAdmin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Admin\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-Branch.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-Timer.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-ExclusiveBranch.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-MergeBranch.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-Delete.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-Publish.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Activity-Redirect.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" DependsOnTargets="AfterBuildCompiler">
-    <PropertyGroup>
-      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
-    </PropertyGroup>
-    <!-- If this is an area child project, uncomment the following line:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    -->
-    <!-- If this is an area parent project, uncomment the following lines:
-    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-    -->
-  </Target>
-  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>45979</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7059493C-8251-4764-9C1E-2368B8B485BC}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.Workflows</RootNamespace>
+    <AssemblyName>Orchard.Workflows</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </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>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\jquery.jsPlumb-1.4.1-all-min.js" />
+    <Content Include="Scripts\orchard-workflows-serialize.js" />
+    <Content Include="Scripts\orchard-workflows.js" />
+    <Content Include="Styles\workflows-activity-logging.css" />
+    <Content Include="Styles\workflows-activity-trigger.css" />
+    <Content Include="Styles\workflows-activity-signal.css" />
+    <Content Include="Styles\workflows-activity-web-request.css" />
+    <Content Include="Styles\workflows-activity-redirect.css" />
+    <Content Include="Styles\workflows-activity-merge-branch.css" />
+    <Content Include="Styles\workflows-activity-exclusive-branch.css" />
+    <Content Include="Styles\workflows-activity-content-delete.css" />
+    <Content Include="Styles\workflows-activity-content-updated.css" />
+    <Content Include="Styles\images\menu.workflows.png" />
+    <Content Include="Styles\menu.workflows-admin.css" />
+    <Content Include="Styles\workflows-activity.css" />
+    <Content Include="Styles\images\cog.png" />
+    <Content Include="Styles\workflows-activity-delete.css" />
+    <Content Include="Styles\workflows-activity-timer.css" />
+    <Content Include="Styles\workflows-activity-branch.css" />
+    <Content Include="Styles\orchard-workflows-admin.css" />
+    <Content Include="Styles\workflows-activity-notify.css" />
+    <Content Include="Styles\workflows-activity-publish.css" />
+    <Content Include="Styles\workflows-activity-content-removed.css" />
+    <Content Include="Styles\workflows-activity-content-published.css" />
+    <Content Include="Styles\workflows-activity-content-versioned.css" />
+    <Content Include="Styles\workflows-activity-content-created.css" />
+    <Content Include="Web.config" />
+    <Content Include="Scripts\Web.config" />
+    <Content Include="Styles\Web.config" />
+    <Compile Include="Activities\LoggingActivity.cs" />
+    <Compile Include="Forms\LoggingActivityForms.cs" />
+    <Compile Include="Helpers\OutcomeSerializerExtensions.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Module.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
+      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
+      <Name>Orchard.Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
+      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
+      <Name>Orchard.Tokens</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Activities\ContentActivity.cs" />
+    <Compile Include="Activities\BranchActivity.cs" />
+    <Compile Include="Activities\TriggerActivity.cs" />
+    <Compile Include="Activities\SignalActivity.cs" />
+    <Compile Include="Activities\MergeBranchActivity.cs" />
+    <Compile Include="Activities\DeleteActivity.cs" />
+    <Compile Include="Activities\ExclusiveBranchActivity.cs" />
+    <Compile Include="Activities\RedirectActivity.cs" />
+    <Compile Include="Activities\TimerActivity.cs" />
+    <Compile Include="Activities\WebRequestActivity.cs" />
+    <Compile Include="Controllers\SignalController.cs" />
+    <Compile Include="Forms\SignalForms.cs" />
+    <Compile Include="Forms\RedirectActionForm.cs" />
+    <Compile Include="Forms\TimerForms.cs" />
+    <Compile Include="Forms\BranchForms.cs" />
+    <Compile Include="Activities\PublishActivity.cs" />
+    <Compile Include="Activities\NotificationActivity.cs" />
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Drivers\WorkflowDriver.cs" />
+    <Compile Include="Forms\WebRequestForm.cs" />
+    <Compile Include="Handlers\WorkflowContentHandler.cs" />
+    <Compile Include="Handlers\WorkflowHandler.cs" />
+    <Compile Include="Recipes\Builders\WorkflowsStep.cs" />
+    <Compile Include="Recipes\Executors\WorkflowsStep.cs" />
+    <Compile Include="Models\AwaitingActivityRecord.cs" />
+    <Compile Include="Models\CancellationToken.cs" />
+    <Compile Include="Models\ActivityContext.cs" />
+    <Compile Include="Models\WorkflowContext.cs" />
+    <Compile Include="Models\ActivityRecord.cs" />
+    <Compile Include="Models\TransitionRecord.cs" />
+    <Compile Include="Models\WorkflowRecord.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Models\WorkflowDefinitionRecord.cs" />
+    <Compile Include="Forms\ContentActivityForms.cs" />
+    <Compile Include="Forms\NotificationActivityForms.cs" />
+    <Compile Include="ResourceManifest.cs" />
+    <Compile Include="Services\GenericEventService.cs" />
+    <Compile Include="Services\ISignalService.cs" />
+    <Compile Include="Services\Task.cs" />
+    <Compile Include="Services\Event.cs" />
+    <Compile Include="Services\IActivity.cs" />
+    <Compile Include="Services\ActivitiesManager.cs" />
+    <Compile Include="Services\IActivitiesManager.cs" />
+    <Compile Include="Services\IWorkflowManager.cs" />
+    <Compile Include="Services\WorkflowManager.cs" />
+    <Compile Include="Tokens\SignalTokens.cs" />
+    <Compile Include="Tokens\StateTokens.cs" />
+    <Compile Include="ViewModels\AdminEditViewModel.cs" />
+    <Compile Include="ViewModels\AdminIndexViewModel.cs" />
+    <Compile Include="ViewModels\WorkflowDefinitionViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Placement.info" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Create.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\EditActivity.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\ActivityToolbox.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-Notify.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts.Workflow.SummaryAdmin.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\List.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-Branch.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-Timer.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-ExclusiveBranch.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-MergeBranch.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-Delete.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-Publish.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-Redirect.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </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" DependsOnTargets="AfterBuildCompiler">
+    <PropertyGroup>
+      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
+    </PropertyGroup>
+    <!-- If this is an area child project, uncomment the following line:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    -->
+    <!-- If this is an area parent project, uncomment the following lines:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
+    -->
+  </Target>
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</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.Workflows/packages.config b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
index b89128020..88143b1b5 100644
--- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
+++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
@@ -49,9 +49,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -144,6 +144,9 @@
     <Content Include="Views\Route\Index.cshtml" />
     <Content Include="Views\Taxonomy\Index.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Orchard.Web/Modules/Upgrade/packages.config b/src/Orchard.Web/Modules/Upgrade/packages.config
new file mode 100644
index 000000000..da393e2d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Upgrade/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index df6e4796e..f09a27f2a 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -71,8 +71,8 @@
       <HintPath>..\packages\MySql.Data.6.7.9\lib\net45\MySql.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Npgsql, Version=2.2.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config
index e5958e715..b99683090 100644
--- a/src/Orchard.Web/packages.config
+++ b/src/Orchard.Web/packages.config
@@ -3,4 +3,5 @@
   <package id="Autofac" version="3.5.2" targetFramework="net451" />
   <package id="log4net" version="2.0.3" targetFramework="net451" />
   <package id="MySql.Data" version="6.7.9" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index 6f605606a..78491058b 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -87,9 +87,9 @@
     <Reference Include="Microsoft.Owin">
       <HintPath>..\..\lib\owin\Microsoft.Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\..\lib\nhibernate\NHibernate.dll</HintPath>
diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config
index 82a735183..f31fbbd9a 100644
--- a/src/Orchard/packages.config
+++ b/src/Orchard/packages.config
@@ -4,4 +4,5 @@
   <package id="Autofac.Configuration" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.1" targetFramework="net451" />
   <package id="log4net" version="2.0.3" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
 </packages>
\ No newline at end of file