diff --git a/aspnet35.build b/aspnet35.build
index 7334002639..418270e96b 100644
--- a/aspnet35.build
+++ b/aspnet35.build
@@ -66,7 +66,7 @@
         </copy>
 
         <!--standard web.config-->
-        <copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
+        <copy file="${root.dir}\config templates\aspnet35.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
 
         <!--standard /config files-->
         <copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
diff --git a/aspnet35.config b/aspnet35.config
index a49064291a..4467ae5d97 100644
--- a/aspnet35.config
+++ b/aspnet35.config
@@ -1,215 +1,227 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
+    <configSections >
+        <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
+        <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+        <!-- ASPNETAJAX  -->
 
-    <!-- ASPNETAJAX -->
-    <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+        <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+            <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+                <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+                <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+                    <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
+                    <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+                    <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+                    <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+                </sectionGroup>
+            </sectionGroup>
         </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>
 
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
 
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
+        <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
+        <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
+        <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
+    </configSections>
 
+    <urlrewritingnet configSource="config\UrlRewriting.config" />
+    <microsoft.scripting configSource="config\scripting.config" />
+    <clientDependency configSource="config\ClientDependency.config" />
+    <Examine configSource="config\ExamineSettings.config" />
+    <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+    <appSettings>
 
-  <appSettings>
-    <add key="umbracoDbDSN" value="datalayer=SqlServer;server=.\sqlexpress;database=DATABASE;user id=DBUSER;password=PASSWORD" />
-    <add key="umbracoConfigurationStatus" value="" />
-    <add key="umbracoReservedUrls" value="/config/splashes/booting.aspx,/install/default.aspx,/config/splashes/noNodes.aspx" />
-    <add key="umbracoReservedPaths" value="/umbraco/" />
-    <add key="umbracoContentXML" value="/data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="/data" />
-    <add key="umbracoPath" value="/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoDisableVersionCheck" value="true" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-  </appSettings>
+        <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=DATABSE;user id=USER;password=PASS" />
+        <add key="umbracoConfigurationStatus" value="" />
+        <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
+        <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+        <add key="umbracoContentXML" value="~/data/umbraco.config" />
+        <add key="umbracoStorageDirectory" value="~/data" />
+        <add key="umbracoPath" value="~/umbraco" />
+        <add key="umbracoEnableStat" value="false" />
+        <add key="umbracoHideTopLevelNodeFromPath" value="true" />
+        <add key="umbracoEditXhtmlMode" value="true" />
+        <add key="umbracoUseDirectoryUrls" value="false" />
+        <add key="umbracoDebugMode" value="true" />
+        <add key="umbracoTimeOutInMinutes" value="20" />
+        <add key="umbracoVersionCheckPeriod" value="7" />
+        <add key="umbracoDisableXsltExtensions" value="true" />
+        <add key="umbracoDefaultUILanguage" value="en" />
+        <add key="umbracoProfileUrl" value="profiler" />
+        <add key="umbracoUseSSL" value="false" />
+        <add key="umbracoUseMediumTrust" value="false" />
 
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-
-  <!-- REMOVE FOR BETA -->
-  <!-- added by NH to test foreign membership providers-->
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <add name="LocalSqlServer" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=C:\USERS\HARTVIG\DOCUMENTS\VISUAL STUDIO 2005\WEBSITES\AJAXENABLEDWEBSITE2\APP_DATA\ASPNETDB.MDF;Integrated Security=True" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-
-  <system.web>
-    <!--
-    <trust level="Medium" originUrl=".*" />-->
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-      </controls>
-    </pages>
-
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-    </httpModules>
-
-    <httpHandlers>
-      <remove verb="*" path="*.asmx"/>
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
-
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-    </httpHandlers>
-
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-      </assemblies>
-    </compilation>
-
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-
-    <authorization>
-      <allow users="?" />
-    </authorization>
-
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="TestType" />
-        <add name="AspNetSqlMemberShipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="LocalSqlServer" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" />
-      </providers>
-    </membership>
-
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" applicationName="umbraco" />
-      </providers>
-    </roleManager>
-
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-
-  <!-- ASPNET3.5 CODEDOM-->
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-        <providerOption name="CompilerVersion" value="v3.5"/>
-        <providerOption name="WarnAsError" value="false"/>
-      </compiler>
-    </compilers>
-  </system.codedom>
-
-
-  <!-- ASPNETAJAX -->
-  <system.web.extensions>
-    <scripting>
-      <scriptResourceHandler enableCompression="true" enableCaching="true" />
-    </scripting>
-  </system.web.extensions>
-
-
-
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
+        <!-- 
+      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
+      Alex Norcliffe 2010 02 for 4.1
     -->
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false"/>
-    <modules>
-      <!-- Asp.net 3.5 Modules-->
-      <remove name="ScriptModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add key="umbracoContentXMLUseLocalTemp" value="false"/>
+    </appSettings>
+    <system.net>
+        <mailSettings>
+            <smtp>
+                <network host="127.0.0.1" userName="username" password="password" />
+            </smtp>
+        </mailSettings>
+    </system.net>
+    <!-- REMOVE FOR BETA -->
+    <!-- added by NH to test foreign membership providers-->
+    <connectionStrings>
+        <remove name="LocalSqlServer" />
+        <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
+    </connectionStrings>
+    <system.web>
+        <!-- <trust level="Medium" originUrl=".*" /> -->
+        <customErrors mode="Off" />
+        <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
+        <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
+        <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
+        <xhtmlConformance mode="Strict" />
+        <pages enableEventValidation="false">
+            <!-- ASPNETAJAX -->
+            <controls>
+                <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
+                <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            </controls>
+        </pages>
+        <httpModules>
+            <!-- URL REWRTIER -->
+            <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+            <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+            <!-- UMBRACO -->
+            <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
+            <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+            <!-- ASPNETAJAX -->
+            <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <!-- CLIENT DEPENDENCY -->
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+        </httpModules>
+        <httpHandlers>
+            <remove verb="*" path="*.asmx"/>
+            <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
+            <!-- UMBRACO CHANNELS -->
+            <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+            <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+            <!-- CLIENT DEPENDENCY -->
+            <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+            <!-- SPELL CHECKER -->
+            <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+        </httpHandlers>
 
-      <!-- UMBRACO modules-->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-    </modules>
-    <handlers>
-      <!-- Asp.net 3.5 handlers-->
-      <remove name="WebServiceHandlerFactory-Integrated"/>
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <compilation defaultLanguage="c#" debug="false" batch="false">
+            <assemblies>
+                <!-- ASPNETAJAX -->
+                <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+                <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+                <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+                <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+                <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+            </assemblies>
+        </compilation>
 
-      <!-- UMBRACO Handlers -->
-      <add verb="*" name="Channels" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-    </handlers>
-  </system.webServer>
+        <authentication mode="Forms">
+            <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
+        </authentication>
+        <authorization>
+            <allow users="?" />
+        </authorization>
+        <!-- Membership Provider -->
+        <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
+            <providers>
+                <clear />
+                <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
+                <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
+            </providers>
+        </membership>
+        <!-- added by NH to support membership providers in access layer -->
+        <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
+            <providers>
+                <clear />
+                <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
+            </providers>
+        </roleManager>
+        <!-- Sitemap provider-->
+        <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
+            <providers>
+                <clear />
+                <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
+            </providers>
+        </siteMap>
+    </system.web>
 
-  <!-- Ajax 1.0 Compatibility -->
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+
+    <system.webServer>
+        <validation validateIntegratedModeConfiguration="false" />
+        <modules>
+            <remove name="UrlRewriteModule" />
+            <remove name="umbracoRequestModule" />
+            <remove name="viewstateMoverModule" />
+            <remove name="umbracoBaseRequestModule" />
+            <remove name="ScriptModule" />
+            <remove name="ClientDependencyModule" />
+
+            <!-- URL REWRTIER -->
+            <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+            <!-- UMBRACO -->
+            <add name="umbracoRequestModule" type="umbraco.presentation.requestModule, umbraco" />
+            <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
+            <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+            <!-- ASPNETAJAX -->
+            <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <!-- CLIENT DEPENDENCY -->
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+
+        </modules>
+
+        <handlers accessPolicy="Read, Write, Script, Execute">
+            <remove name="WebServiceHandlerFactory-Integrated" />
+            <remove name="ScriptHandlerFactory" />
+            <remove name="ScriptHandlerFactoryAppServices" />
+            <remove name="ScriptResource" />
+            <remove name="ClientDependency" />
+            <remove name="SpellChecker" />
+
+            <!-- ASPNETAJAX -->
+            <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <!-- UMBRACO CHANNELS -->
+            <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+            <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+            <!-- CLIENT DEPENDENCY -->
+            <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+            <!-- SPELL CHECKER -->
+            <add verb="GET,HEAD,POST" name="SpellChecker" preCondition="integratedMode" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
+        </handlers>
+    </system.webServer>
+
+    <system.codedom>
+        <compilers>
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+                <providerOption name="CompilerVersion" value="v3.5" />
+                <providerOption name="WarnAsError" value="false" />
+            </compiler>
+        </compilers>
+    </system.codedom>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+                <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+                <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+
+</configuration>
\ No newline at end of file