Need to take the current schema into account for the ExcessiveHeadersCheck

U4-9042: Fixes backoffice members list view for custom membership providers

README.md

@@ -7,9 +7,9 @@ The easiest way to get started is to run `build/build.bat` which will build both
  
 If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
 
-Note that you can always [download a nightly build](https://ci.appveyor.com/project/Umbraco/umbraco-cms-hs8dx/history/branch/dev-v7) so you don't have to build the code yourself.
+Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
 
-## Watch a introduction video ##
+## Watch an introduction video ##
 
 [![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
 

appveyor.yml

@@ -35,7 +35,18 @@ test:
   assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
 artifacts:
 - path: build\UmbracoCms.*
+  name: UmbracoFiles
 - path: build\msbuild.log
+  name: BuildLog
+deploy:
+- provider: AzureBlob
+  storage_account_name: umbraconightlies
+  storage_access_key:
+    secure: bmEMml2SF7QLHULiePa/a01XOeIa2SxJeXuaZ+1R27b+Vb2nNUQVYiPlUyF2cZAFSHI/zO/LekRsVU1rTescGhJjF7SSjKybymI3p+F/OWpwqiu2WfFee1ofXBFx8QHw
+  container: umbraco-750
+  artifact: UmbracoFiles
+  on:
+    branch: dev-v7
 notifications:
 - provider: Slack
   auth_token:

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -30,11 +30,11 @@
       <dependency id="ClientDependency" version="[1.9.1, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
 	  <!-- AutoMapper can not be updated due to: https://github.com/AutoMapper/AutoMapper/issues/373#issuecomment-127644405 -->
-      <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
+      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
-      <dependency id="Examine" version="[0.1.69, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.4.4, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.6.4, 5.0.0)" />
+      <dependency id="Examine" version="[0.1.70, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.4.5, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.6.6, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 2.0.0)" />
       <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />	  
 	  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->

build/NuSpecs/UmbracoCms.nuspec

@@ -16,7 +16,7 @@
     <tags>umbraco</tags>
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
       <dependency id="Umbraco.ModelsBuilder" version="[3.0.4, 4.0.0)" />
     </dependencies>
   </metadata>
@@ -45,4 +45,4 @@
     <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
     <file src="build\**" target="build" />
   </files>
-</package>
+</package>

build/NuSpecs/tools/Web.config.install.xdt

@@ -319,6 +319,7 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
@@ -338,6 +339,10 @@
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
       </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>

build/UmbracoVersion.txt

@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.5.0
+7.5.4

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.5.0")]
-[assembly: AssemblyInformationalVersion("7.5.0")]
+[assembly: AssemblyFileVersion("7.5.4")]
+[assembly: AssemblyInformationalVersion("7.5.4")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.5.0");
+        private static readonly Version Version = new Version("7.5.4");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Constants-ObjectTypes.cs

@@ -69,6 +69,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
 
+            /// <summary>
+            /// Guid for a Document object.
+            /// </summary>
+            public static readonly Guid DocumentGuid = new Guid(Document);
+
             /// <summary>
             /// Guid for a Document Type object.
             /// </summary>

src/Umbraco.Core/Events/MigrationEventArgs.cs

@@ -128,8 +128,14 @@ namespace Umbraco.Core.Events
             get { return TargetSemVersion.GetVersion(); }
         }
 
+        /// <summary>
+        /// Gets the origin version of the migration, i.e. the one that is currently installed.
+        /// </summary>
         public SemVersion ConfiguredSemVersion { get; private set; }
 
+        /// <summary>
+        /// Gets the target version of the migration.
+        /// </summary>
         public SemVersion TargetSemVersion { get; private set; }
 
         public string ProductName { get; private set; }

src/Umbraco.Core/IO/FileSystemExtensions.cs

@@ -41,11 +41,7 @@ namespace Umbraco.Core.IO
         {
             using (var file = fs.OpenFile(path))
             {
-                using (var sr = new StreamReader(file))
-                {
-                    var str = sr.ReadToEnd();
-                    return str.Length;
-                }
+                return file.Length;
             }
         }
 

src/Umbraco.Core/IO/UmbracoMediaFile.cs

@@ -86,7 +86,7 @@ namespace Umbraco.Core.IO
         private void Initialize()
         {
             Filename = _fs.GetFileName(Path);
-            Extension = _fs.GetExtension(Path) != null
+            Extension = string.IsNullOrEmpty(_fs.GetExtension(Path)) == false
                 ? _fs.GetExtension(Path).Substring(1).ToLowerInvariant()
                 : "";
             Url = _fs.GetUrl(Path);

src/Umbraco.Core/Models/PublicAccessEntry.cs

@@ -107,9 +107,9 @@ namespace Umbraco.Core.Models
 
         public void ClearRules()
         {
-            foreach (var rule in _ruleCollection)
+            for (var i = _ruleCollection.Count - 1; i >= 0; i--)
             {
-                RemoveRule(rule);
+                RemoveRule(_ruleCollection[i]);
             }
         }
 

src/Umbraco.Core/Models/UserExtensions.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Globalization;
-using System.Linq;
-using System.Threading;
-using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 
@@ -83,5 +80,19 @@ namespace Umbraco.Core.Models
             if (media == null) throw new ArgumentNullException("media");
             return HasPathAccess(media.Path, user.StartMediaId, Constants.System.RecycleBinMedia);
         }
+
+
+        /// <summary>
+        /// Determines whether this user is an admin.
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns>
+        /// 	<c>true</c> if this user is admin; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool IsAdmin(this IUser user)
+        {
+            if (user == null) throw new ArgumentNullException("user");
+            return user.UserType.Alias == "admin";
+        }
     }
 }

src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs

@@ -122,7 +122,7 @@ namespace Umbraco.Core.Persistence.Factories
             else if (entity is IMemberType)
                 nodeObjectType = Constants.ObjectTypes.MemberTypeGuid;
             else
-                throw new Exception("oops: invalid entity.");
+                throw new Exception("Invalid entity.");
 
             var contentTypeDto = new ContentTypeDto
             {

src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs

@@ -79,7 +79,7 @@ namespace Umbraco.Core.Persistence.Factories
                 {
                     // note: no idea why Id is nullable here, but better check
                     if (groupDto.Id.HasValue == false)
-                        throw new Exception("oops: groupDto.Id has no value.");
+                        throw new Exception("GroupDto.Id has no value.");
                     group.Id = groupDto.Id.Value;
                 }
 

src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs

@@ -34,11 +34,27 @@ namespace Umbraco.Core.Persistence
             return sql.Where(whereExpression, expresionist.GetSqlParameters());
         }
 
+        private static string GetFieldName<T>(Expression<Func<T, object>> fieldSelector, ISqlSyntaxProvider sqlSyntax)
+        {
+            var field = ExpressionHelper.FindProperty(fieldSelector) as PropertyInfo;
+            var fieldName = field.GetColumnName();
+
+            var type = typeof(T);
+            var tableName = type.GetTableName();
+
+            return sqlSyntax.GetQuotedTableName(tableName) + "." + sqlSyntax.GetQuotedColumnName(fieldName);
+        }
+
+        [Obsolete("Use the overload specifying ISqlSyntaxProvider instead")]
         public static Sql WhereIn<T>(this Sql sql, Expression<Func<T, object>> fieldSelector, IEnumerable values)
         {
-            var expresionist = new PocoToSqlExpressionHelper<T>();
-            var fieldExpression = expresionist.Visit(fieldSelector);
-            return sql.Where(fieldExpression + " IN (@values)", new {@values = values});
+            return sql.WhereIn(fieldSelector, values, SqlSyntaxContext.SqlSyntaxProvider);
+        }
+
+        public static Sql WhereIn<T>(this Sql sql, Expression<Func<T, object>> fieldSelector, IEnumerable values, ISqlSyntaxProvider sqlSyntax)
+        {
+            var fieldName = GetFieldName(fieldSelector, sqlSyntax);
+            return sql.Where(fieldName + " IN (@values)", new { values });
         }
 
         [Obsolete("Use the overload specifying ISqlSyntaxProvider instead")]
@@ -49,17 +65,7 @@ namespace Umbraco.Core.Persistence
 
         public static Sql OrderBy<TColumn>(this Sql sql, Expression<Func<TColumn, object>> columnMember, ISqlSyntaxProvider sqlSyntax)
         {
-            var column = ExpressionHelper.FindProperty(columnMember) as PropertyInfo;
-            var columnName = column.GetColumnName();
-
-            var type = typeof(TColumn);
-            var tableName = type.GetTableName();
-
-            //need to ensure the order by is in brackets, see: https://github.com/toptensoftware/PetaPoco/issues/177
-            var syntax = string.Format("({0}.{1})",
-                sqlSyntax.GetQuotedTableName(tableName),
-                sqlSyntax.GetQuotedColumnName(columnName));
-
+            var syntax = "(" + GetFieldName(columnMember, sqlSyntax) + ")";
             return sql.OrderBy(syntax);
         }
 

src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryVersionable.cs

@@ -34,11 +34,19 @@ namespace Umbraco.Core.Persistence.Repositories
         int CountDescendants(int parentId, string contentTypeAlias = null);
 
         /// <summary>
-        /// Gets a list of all versions for an <see cref="TEntity"/>.
+        /// Gets a list of all versions for an <see cref="TEntity"/> ordered so latest is first
         /// </summary>
         /// <param name="id">Id of the <see cref="TEntity"/> to retrieve versions from</param>
         /// <returns>An enumerable list of the same <see cref="TEntity"/> object with different versions</returns>
-        IEnumerable<TEntity> GetAllVersions(int id);
+        IEnumerable<TEntity> GetAllVersions(int id);        
+
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        IEnumerable<Guid> GetVersionIds(int id, int maxRows);
 
         /// <summary>
         /// Gets a specific version of an <see cref="TEntity"/>.

src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs

@@ -413,6 +413,8 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 foreach (var property in entity.Properties)
                 {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
                     property.Id = keyDictionary[property.PropertyTypeId];
                 }
             }

src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs

@@ -365,6 +365,8 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 foreach (var property in ((Member)entity).Properties)
                 {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
                     property.Id = keyDictionary[property.PropertyTypeId];
                 }
             }

src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs

@@ -18,6 +18,27 @@ namespace Umbraco.Core.Persistence.Repositories
             _unitOfWork = unitOfWork;
         }
 
+        public IEnumerable<Notification> GetUsersNotifications(IEnumerable<int> userIds, string action, IEnumerable<int> nodeIds, Guid objectType)
+        {
+            var nodeIdsA = nodeIds.ToArray();
+            var syntax = ApplicationContext.Current.DatabaseContext.SqlSyntax; // bah
+            var sql = new Sql()
+                    .Select("DISTINCT umbracoNode.id nodeId, umbracoUser.id userId, umbracoNode.nodeObjectType, umbracoUser2NodeNotify.action")
+                    .From<User2NodeNotifyDto>(syntax)
+                    .InnerJoin<NodeDto>(syntax).On<User2NodeNotifyDto, NodeDto>(syntax, left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<UserDto>(syntax).On<User2NodeNotifyDto, UserDto>(syntax, left => left.UserId, right => right.Id)
+                    .Where<NodeDto>(x => x.NodeObjectType == objectType)
+                    .Where<UserDto>(x => x.Disabled == false) // only approved users
+                    .Where<User2NodeNotifyDto>(x => x.Action == action); // on the specified action
+            if (nodeIdsA.Length > 0)
+                sql
+                    .WhereIn<NodeDto>(x => x.NodeId, nodeIdsA); // for the specified nodes
+            sql
+                .OrderBy<UserDto>(x => x.Id, syntax)
+                .OrderBy<NodeDto>(dto => dto.NodeId, syntax);
+            return _unitOfWork.Database.Fetch<dynamic>(sql).Select(x => new Notification(x.nodeId, x.userId, x.action, objectType));
+        }
+
         public IEnumerable<Notification> GetUserNotifications(IUser user)
         {
             var sql = new Sql()

src/Umbraco.Core/Persistence/Repositories/TagRepository.cs

@@ -565,7 +565,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             var array = tagsToInsert
                 .Select(tag =>
-                    string.Format("select '{0}' as Tag, '{1}' as " + SqlSyntax.GetQuotedColumnName("group") + @"",
+                    string.Format("select N'{0}' as Tag, '{1}' as " + SqlSyntax.GetQuotedColumnName("group") + @"",
                         PetaPocoExtensions.EscapeAtSymbols(tag.Text.Replace("'", "''")), tag.Group))
                 .ToArray();
             return "(" + string.Join(" union ", array).Replace("  ", " ") + ") as TagSet";

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -320,51 +320,51 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </remarks>
         public IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, int pageIndex, int pageSize, out int totalRecords, Expression<Func<IUser, string>> orderBy)
         {
-            if (orderBy == null) throw new ArgumentNullException("orderBy");
+            if (orderBy == null)
+                throw new ArgumentNullException("orderBy");
 
-            var sql = new Sql();
-            sql.Select("*").From<UserDto>();
-
-            Sql resultQuery;
-            if (query != null)
-            {
-                var translator = new SqlTranslator<IUser>(sql, query);
-                resultQuery = translator.Translate();
-            }
-            else
-            {
-                resultQuery = sql;
-            }
-
-            //get the referenced column name
+            // get the referenced column name and find the corresp mapped column name
             var expressionMember = ExpressionHelper.GetMemberInfo(orderBy);
-            //now find the mapped column name
             var mapper = MappingResolver.Current.ResolveMapperByType(typeof(IUser));
             var mappedField = mapper.Map(expressionMember.Name);
+
             if (mappedField.IsNullOrWhiteSpace())
-            {
                 throw new ArgumentException("Could not find a mapping for the column specified in the orderBy clause");
-            }
-            //need to ensure the order by is in brackets, see: https://github.com/toptensoftware/PetaPoco/issues/177
-            resultQuery.OrderBy(string.Format("({0})", mappedField));
 
-            var pagedResult = Database.Page<UserDto>(pageIndex + 1, pageSize, resultQuery);
+            var sql = new Sql()
+                .Select("umbracoUser.Id")
+                .From<UserDto>(SqlSyntax);
 
-            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
+            var idsQuery = query == null ? sql : new SqlTranslator<IUser>(sql, query).Translate();
+
+            // need to ensure the order by is in brackets, see: https://github.com/toptensoftware/PetaPoco/issues/177
+            idsQuery.OrderBy("(" + mappedField + ")");
+            var page = Database.Page<int>(pageIndex + 1, pageSize, idsQuery);
+            totalRecords = Convert.ToInt32(page.TotalItems);
 
-            //now that we have the user dto's we need to construct true members from the list.
             if (totalRecords == 0)
-            {
                 return Enumerable.Empty<IUser>();
-            }
 
-            var ids = pagedResult.Items.Select(x => x.Id).ToArray();
-            var result = ids.Length == 0 ? Enumerable.Empty<IUser>() : GetAll(ids);
-
-            //now we need to ensure this result is also ordered by the same order by clause
-            return result.OrderBy(orderBy.Compile());
+            // now get the actual users and ensure they are ordered properly (same clause)
+            var ids = page.Items.ToArray();
+            return ids.Length == 0 ? Enumerable.Empty<IUser>() : GetAll(ids).OrderBy(orderBy.Compile());
         }
-        
+
+        internal IEnumerable<IUser> GetNextUsers(int id, int count)
+        {
+            var idsQuery = new Sql()
+                .Select("umbracoUser.Id")
+                .From<UserDto>(SqlSyntax)
+                .Where<UserDto>(x => x.Id >= id)
+                .OrderBy<UserDto>(x => x.Id, SqlSyntax);
+
+            // first page is index 1, not zero
+            var ids = Database.Page<int>(1, count, idsQuery).Items.ToArray();
+
+            // now get the actual users and ensure they are ordered properly (same clause)
+            return ids.Length == 0 ? Enumerable.Empty<IUser>() : GetAll(ids).OrderBy(x => x.Id);
+        }
+
         /// <summary>
         /// Returns permissions for a given user for any number of nodes
         /// </summary>

src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs

@@ -40,6 +40,11 @@ namespace Umbraco.Core.Persistence.Repositories
 
         #region IRepositoryVersionable Implementation
 
+        /// <summary>
+        /// Gets a list of all versions for an <see cref="TEntity"/> ordered so latest is first
+        /// </summary>
+        /// <param name="id">Id of the <see cref="TEntity"/> to retrieve versions from</param>
+        /// <returns>An enumerable list of the same <see cref="TEntity"/> object with different versions</returns>
         public virtual IEnumerable<TEntity> GetAllVersions(int id)
         {
             var sql = new Sql();
@@ -60,6 +65,28 @@ namespace Umbraco.Core.Persistence.Repositories
             }
         }
 
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        public virtual IEnumerable<Guid> GetVersionIds(int id, int maxRows)
+        {
+            var sql = new Sql();
+            sql.Select("cmsDocument.versionId")
+                .From<DocumentDto>(SqlSyntax)
+                .InnerJoin<ContentDto>(SqlSyntax)
+                .On<DocumentDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .InnerJoin<NodeDto>(SqlSyntax)
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                .Where<NodeDto>(x => x.NodeId == id)
+                .OrderByDescending<DocumentDto>(x => x.UpdateDate, SqlSyntax);
+
+            return Database.Fetch<Guid>(SqlSyntax.SelectTop(sql, maxRows));
+        }
+
         public virtual void DeleteVersion(Guid versionId)
         {
             var dto = Database.FirstOrDefault<ContentVersionDto>("WHERE versionId = @VersionId", new { VersionId = versionId });
@@ -583,6 +610,8 @@ WHERE EXISTS(
                     return "cmsContentVersion.VersionDate";
                 case "NAME":
                     return "umbracoNode.text";
+                case "PUBLISHED":
+                    return "cmsDocument.published";
                 case "OWNER":
                     //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
                     return "umbracoNode.nodeUser";

src/Umbraco.Core/Security/AuthenticationExtensions.cs

@@ -113,8 +113,8 @@ namespace Umbraco.Core.Security
 
             //Otherwise convert to a UmbracoBackOfficeIdentity if it's auth'd and has the back office session            
             var claimsIdentity = http.User.Identity as ClaimsIdentity;
-            if (claimsIdentity != null && claimsIdentity.IsAuthenticated)
-            {                
+            if (claimsIdentity != null && claimsIdentity.IsAuthenticated && claimsIdentity.HasClaim(x => x.Type == Constants.Security.SessionIdClaimType))
+            {                 
                 try
                 {
                     return UmbracoBackOfficeIdentity.FromClaimsIdentity(claimsIdentity);

src/Umbraco.Core/Services/ContentService.cs

@@ -342,11 +342,23 @@ namespace Umbraco.Core.Services
         /// <returns><see cref="IContent"/></returns>
         public IEnumerable<IContent> GetByIds(IEnumerable<int> ids)
         {
-            if (ids.Any() == false) return Enumerable.Empty<IContent>();
+            var idsArray = ids.ToArray();
+            if (idsArray.Length == 0) return Enumerable.Empty<IContent>();
 
             using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork()))
             {
-                return repository.GetAll(ids.ToArray());
+                //ensure that the result has the order based on the ids passed in
+                var result = repository.GetAll(idsArray);
+
+                var content = result.ToDictionary(x => x.Id, x => x);
+
+                var sortedResult = idsArray.Select(x =>
+                {
+                    IContent c;
+                    return content.TryGetValue(x, out c) ? c : null;
+                }).WhereNotNull();
+
+                return sortedResult;
             }
         }
 
@@ -436,6 +448,21 @@ namespace Umbraco.Core.Services
             }
         }
 
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        public IEnumerable<Guid> GetVersionIds(int id, int maxRows)
+        {
+            using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork()))
+            {
+                var versions = repository.GetVersionIds(id, maxRows);
+                return versions;
+            }
+        }
+
         /// <summary>
         /// Gets a collection of <see cref="IContent"/> objects, which are ancestors of the current content.
         /// </summary>

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -791,21 +791,23 @@ namespace Umbraco.Core.Services
 
             using (new WriteLock(Locker))
             {
-
-                //TODO: This needs to change, if we are deleting a content type, we should just delete the data,
-                // this method will recursively go lookup every content item, check if any of it's descendants are
-                // of a different type, move them to the recycle bin, then permanently delete the content items.
-                // The main problem with this is that for every content item being deleted, events are raised...
-                // which we need for many things like keeping caches in sync, but we can surely do this MUCH better.
-
-                _contentService.DeleteContentOfType(contentType.Id);
-
                 var uow = UowProvider.GetUnitOfWork();
                 using (var repository = RepositoryFactory.CreateContentTypeRepository(uow))
                 {
+                    //TODO: This needs to change, if we are deleting a content type, we should just delete the data,
+                    // this method will recursively go lookup every content item, check if any of it's descendants are
+                    // of a different type, move them to the recycle bin, then permanently delete the content items.
+                    // The main problem with this is that for every content item being deleted, events are raised...
+                    // which we need for many things like keeping caches in sync, but we can surely do this MUCH better.
+                    
                     var deletedContentTypes = new List<IContentType>() {contentType};
                     deletedContentTypes.AddRange(contentType.Descendants().OfType<IContentType>());
 
+                    foreach (var deletedContentType in deletedContentTypes)
+                    {
+                        _contentService.DeleteContentOfType(deletedContentType.Id);
+                    }
+                    
                     repository.Delete(contentType);
                     uow.Commit();
 
@@ -833,11 +835,6 @@ namespace Umbraco.Core.Services
 
             using (new WriteLock(Locker))
             {
-                foreach (var contentType in asArray)
-                {
-                    _contentService.DeleteContentOfType(contentType.Id);
-                }
-
                 var uow = UowProvider.GetUnitOfWork();
                 using (var repository = RepositoryFactory.CreateContentTypeRepository(uow))
                 {
@@ -847,6 +844,15 @@ namespace Umbraco.Core.Services
                     foreach (var contentType in asArray)
                     {
                         deletedContentTypes.AddRange(contentType.Descendants().OfType<IContentType>());
+                    }
+
+                    foreach (var deletedContentType in deletedContentTypes)
+                    {
+                        _contentService.DeleteContentOfType(deletedContentType.Id);
+                    }
+
+                    foreach (var contentType in asArray)
+                    {
                         repository.Delete(contentType);
                     }
 

src/Umbraco.Core/Services/IContentService.cs

@@ -298,6 +298,14 @@ namespace Umbraco.Core.Services
         /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
         IEnumerable<IContent> GetVersions(int id);
 
+        /// <summary>
+        /// Gets a list of all version Ids for the given content item ordered so latest is first
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="maxRows">The maximum number of rows to return</param>
+        /// <returns></returns>
+        IEnumerable<Guid> GetVersionIds(int id, int maxRows);
+
         /// <summary>
         /// Gets a collection of <see cref="IContent"/> objects, which reside at the first level / root
         /// </summary>

src/Umbraco.Core/Services/NotificationService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -15,7 +16,6 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Strings;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Services
 {
@@ -55,38 +55,72 @@ namespace Umbraco.Core.Services
             Func<IUser, string[], string> createSubject,
             Func<IUser, string[], string> createBody)
         {
-            if ((entity is IContent) == false)
+            if (entity is IContent == false)
                 throw new NotSupportedException();
 
-            var content = (IContent) entity;
-
-            // lazily get versions - into a list to ensure we can enumerate multiple times
-            List<IContent> allVersions = null;
+            var content = (IContent) entity;
 
-            int totalUsers;
-            var allUsers = _userService.GetAll(0, int.MaxValue, out totalUsers);
-            foreach (var u in allUsers.Where(x => x.IsApproved))
+            // lazily get previous version
+            IContentBase prevVersion = null;
+
+            // do not load *all* users in memory at once
+            // do not load notifications *per user* (N+1 select)
+            // cannot load users & notifications in 1 query (combination btw User2AppDto and User2NodeNotifyDto)
+            // => get batches of users, get all their notifications in 1 query
+            // re. users:
+            //  users being (dis)approved = not an issue, filtered in memory not in SQL
+            //  users being modified or created = not an issue, ordering by ID, as long as we don't *insert* low IDs
+            //  users being deleted = not an issue for GetNextUsers
+            var id = 0;
+            var nodeIds = content.Path.Split(',').Select(int.Parse).ToArray();
+            const int pagesz = 400; // load batches of 400 users
+            do
             {
-                var userNotifications = GetUserNotifications(u, content.Path);
-                var notificationForAction = userNotifications.FirstOrDefault(x => x.Action == action);
-                if (notificationForAction == null) continue;
+                // users are returned ordered by id, notifications are returned ordered by user id
+                var users = ((UserService) _userService).GetNextUsers(id, pagesz).Where(x => x.IsApproved).ToList();
+                var notifications = GetUsersNotifications(users.Select(x => x.Id), action, nodeIds, Constants.ObjectTypes.DocumentGuid).ToList();
+                if (notifications.Count == 0) break;
 
-                if (allVersions == null) // lazy load
-                    allVersions = _contentService.GetVersions(entity.Id).ToList();
-
-                try
+                var i = 0;
+                foreach (var user in users)
                 {
-                    SendNotification(operatingUser, u, content, allVersions, 
-                        actionName, http, createSubject, createBody);
+                    // continue if there's no notification for this user
+                    if (notifications[i].UserId != user.Id) continue; // next user
 
-                    _logger.Debug<NotificationService>(string.Format("Notification type: {0} sent to {1} ({2})",
-                        action, u.Name, u.Email));
+                    // lazy load prev version
+                    if (prevVersion == null)
+                    {
+                        prevVersion = GetPreviousVersion(entity.Id);
+                    }
+
+                    // queue notification
+                    var req = CreateNotificationRequest(operatingUser, user, content, prevVersion, actionName, http, createSubject, createBody);
+                    Enqueue(req);
+
+                    // skip other notifications for this user
+                    while (i < notifications.Count && notifications[i++].UserId == user.Id) ;
+                    if (i >= notifications.Count) break; // break if no more notifications
                 }
-                catch (Exception ex)
-                {
-                    _logger.Error<NotificationService>("An error occurred sending notification", ex);
-                }
-            }
+
+                // load more users if any
+                id = users.Count == pagesz ? users.Last().Id + 1 : -1;
+
+            } while (id > 0);
+        }
+
+        /// <summary>
+        /// Gets the previous version to the latest version of the content item if there is one
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        private IContentBase GetPreviousVersion(int contentId)
+        {
+            // Regarding this: http://issues.umbraco.org/issue/U4-5180
+            // we know they are descending from the service so we know that newest is first
+            // we are only selecting the top 2 rows since that is all we need
+            var allVersions = _contentService.GetVersionIds(contentId, 2).ToList();
+            var prevVersionIndex = allVersions.Count > 1 ? 1 : 0;
+            return _contentService.GetByVersion(allVersions[prevVersionIndex]);
         }
 
         /// <summary>
@@ -106,47 +140,76 @@ namespace Umbraco.Core.Services
             Func<IUser, string[], string> createSubject,
             Func<IUser, string[], string> createBody)
         {
-            if ((entities is IEnumerable<IContent>) == false)
+            if (entities is IEnumerable<IContent> == false)
                 throw new NotSupportedException();
 
-            // ensure we can enumerate multiple times
             var entitiesL = entities as List<IContent> ?? entities.Cast<IContent>().ToList();
 
-            // lazily get versions - into lists to ensure we can enumerate multiple times
-            var allVersionsDictionary = new Dictionary<int, List<IContent>>();
+            //exit if there are no entities
+            if (entitiesL.Count == 0) return;
 
-            int totalUsers;
-            var allUsers = _userService.GetAll(0, int.MaxValue, out totalUsers);
-            foreach (var u in allUsers.Where(x => x.IsApproved))
+            //put all entity's paths into a list with the same indicies
+            var paths = entitiesL.Select(x => x.Path.Split(',').Select(int.Parse).ToArray()).ToArray();
+
+            // lazily get versions
+            var prevVersionDictionary = new Dictionary<int, IContentBase>();
+
+            // see notes above
+            var id = 0;
+            const int pagesz = 400; // load batches of 400 users
+            do
             {
-                var userNotifications = GetUserNotifications(u).ToArray();
-
-                foreach (var content in entitiesL)
+                // users are returned ordered by id, notifications are returned ordered by user id
+                var users = ((UserService)_userService).GetNextUsers(id, pagesz).Where(x => x.IsApproved).ToList();
+                var notifications = GetUsersNotifications(users.Select(x => x.Id), action, Enumerable.Empty<int>(), Constants.ObjectTypes.DocumentGuid).ToList();
+                if (notifications.Count == 0) break;
+
+                var i = 0;
+                foreach (var user in users)
                 {
-                    var userNotificationsByPath = FilterUserNotificationsByPath(userNotifications, content.Path);
-                    var notificationForAction = userNotificationsByPath.FirstOrDefault(x => x.Action == action);
-                    if (notificationForAction == null) continue;
+                    // continue if there's no notification for this user
+                    if (notifications[i].UserId != user.Id) continue; // next user
 
-                    var allVersions = allVersionsDictionary.ContainsKey(content.Id) // lazy load
-                        ? allVersionsDictionary[content.Id]
-                        : allVersionsDictionary[content.Id] = _contentService.GetVersions(content.Id).ToList();
-
-                    try
+                    for (var j = 0; j < entitiesL.Count; j++)
                     {
-                        SendNotification(operatingUser, u, content, allVersions, 
-                            actionName, http, createSubject, createBody);
+                        var content = entitiesL[j];
+                        var path = paths[j];
+                        
+                        // test if the notification applies to the path ie to this entity
+                        if (path.Contains(notifications[i].EntityId) == false) continue; // next entity
+                        
+                        if (prevVersionDictionary.ContainsKey(content.Id) == false)
+                        {
+                            prevVersionDictionary[content.Id] = GetPreviousVersion(content.Id);
+                        }
+                        
+                        // queue notification
+                        var req = CreateNotificationRequest(operatingUser, user, content, prevVersionDictionary[content.Id], actionName, http, createSubject, createBody);
+                        Enqueue(req);
+                    }
 
-                        _logger.Debug<NotificationService>(string.Format("Notification type: {0} sent to {1} ({2})",
-                            action, u.Name, u.Email));
-                    }
-                    catch (Exception ex)
+                    // skip other notifications for this user, essentially this means moving i to the next index of notifications
+                    // for the next user.
+                    do
                     {
-                        _logger.Error<NotificationService>("An error occurred sending notification", ex);
-                    }
-                }
-            }
+                        i++;
+                    } while (i < notifications.Count && notifications[i].UserId == user.Id);
+                    
+                    if (i >= notifications.Count) break; // break if no more notifications
+                }
+
+                // load more users if any
+                id = users.Count == pagesz ? users.Last().Id + 1 : -1;
+
+            } while (id > 0);
         }
 
+        private IEnumerable<Notification> GetUsersNotifications(IEnumerable<int> userIds, string action, IEnumerable<int> nodeIds, Guid objectType)
+        {
+            var uow = _uowProvider.GetUnitOfWork();
+            var repository = new NotificationsRepository(uow);
+            return repository.GetUsersNotifications(userIds, action, nodeIds, objectType);
+        }
 
         /// <summary>
         /// Gets the notifications for the user
@@ -184,7 +247,7 @@ namespace Umbraco.Core.Services
         public IEnumerable<Notification> FilterUserNotificationsByPath(IEnumerable<Notification> userNotifications, string path)
         {
             var pathParts = path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
-            return userNotifications.Where(r => pathParts.InvariantContains(r.EntityId.ToString(CultureInfo.InvariantCulture))).ToList();            
+            return userNotifications.Where(r => pathParts.InvariantContains(r.EntityId.ToString(CultureInfo.InvariantCulture))).ToList();
         }
 
         /// <summary>
@@ -254,29 +317,23 @@ namespace Umbraco.Core.Services
         /// <param name="performingUser"></param>
         /// <param name="mailingUser"></param>
         /// <param name="content"></param>
-        /// <param name="allVersions"></param>
+        /// <param name="oldDoc"></param>
         /// <param name="actionName">The action readable name - currently an action is just a single letter, this is the name associated with the letter </param>
         /// <param name="http"></param>
         /// <param name="createSubject">Callback to create the mail subject</param>
         /// <param name="createBody">Callback to create the mail body</param>
-        private void SendNotification(IUser performingUser, IUser mailingUser, IContent content, IEnumerable<IContent> allVersions, string actionName, HttpContextBase http, 
+        private NotificationRequest CreateNotificationRequest(IUser performingUser, IUser mailingUser, IContentBase content, IContentBase oldDoc,            
+            string actionName, HttpContextBase http,
             Func<IUser, string[], string> createSubject,
             Func<IUser, string[], string> createBody)
         {
             if (performingUser == null) throw new ArgumentNullException("performingUser");
             if (mailingUser == null) throw new ArgumentNullException("mailingUser");
             if (content == null) throw new ArgumentNullException("content");
-            if (allVersions == null) throw new ArgumentNullException("allVersions");
             if (http == null) throw new ArgumentNullException("http");
             if (createSubject == null) throw new ArgumentNullException("createSubject");
-            if (createBody == null) throw new ArgumentNullException("createBody");
-
-            //Ensure they are sorted: http://issues.umbraco.org/issue/U4-5180
-            var allVersionsAsArray = allVersions.OrderBy(x => x.UpdateDate).ToArray();
-
-            int versionCount = (allVersionsAsArray.Length > 1) ? (allVersionsAsArray.Length - 2) : (allVersionsAsArray.Length - 1);
-            var oldDoc = _contentService.GetByVersion(allVersionsAsArray[versionCount].Version);
-
+            if (createBody == null) throw new ArgumentNullException("createBody");            
+            
             // build summary
             var summary = new StringBuilder();
             var props = content.Properties.ToArray();
@@ -290,16 +347,16 @@ namespace Umbraco.Core.Services
                 {
                     var oldProperty = oldDoc.Properties[p.PropertyType.Alias];
                     oldText = oldProperty.Value != null ? oldProperty.Value.ToString() : "";
-                    
+
                     // replace html with char equivalent
                     ReplaceHtmlSymbols(ref oldText);
                     ReplaceHtmlSymbols(ref newText);
                 }
-                
+
 
                 // make sure to only highlight changes done using TinyMCE editor... other changes will be displayed using default summary
                 // TODO: We should probably allow more than just tinymce??
-                if ((p.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.TinyMCEAlias) 
+                if ((p.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.TinyMCEAlias)
                     && string.CompareOrdinal(oldText, newText) != 0)
                 {
                     summary.Append("<tr>");
@@ -308,26 +365,31 @@ namespace Umbraco.Core.Services
                         "<td style='text-align: left; vertical-align: top;'> <span style='background-color:red;'>Red for deleted characters</span>&nbsp;<span style='background-color:yellow;'>Yellow for inserted characters</span></td>");
                     summary.Append("</tr>");
                     summary.Append("<tr>");
-                    summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'> New " +
-                                   p.PropertyType.Name + "</th>");
-                    summary.Append("<td style='text-align: left; vertical-align: top;'>" +
-                                   ReplaceLinks(CompareText(oldText, newText, true, false, "<span style='background-color:yellow;'>", string.Empty), http.Request) +
-                                   "</td>");
+                    summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'> New ");
+                    summary.Append(p.PropertyType.Name);
+                    summary.Append("</th>");
+                    summary.Append("<td style='text-align: left; vertical-align: top;'>");
+                    summary.Append(ReplaceLinks(CompareText(oldText, newText, true, false, "<span style='background-color:yellow;'>", string.Empty), http.Request));
+                    summary.Append("</td>");
                     summary.Append("</tr>");
                     summary.Append("<tr>");
-                    summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'> Old " +
-                                   p.PropertyType.Name + "</th>");
-                    summary.Append("<td style='text-align: left; vertical-align: top;'>" +
-                                   ReplaceLinks(CompareText(newText, oldText, true, false, "<span style='background-color:red;'>", string.Empty), http.Request) +
-                                   "</td>");
+                    summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'> Old ");
+                    summary.Append(p.PropertyType.Name);
+                    summary.Append("</th>");
+                    summary.Append("<td style='text-align: left; vertical-align: top;'>");
+                    summary.Append(ReplaceLinks(CompareText(newText, oldText, true, false, "<span style='background-color:red;'>", string.Empty), http.Request));
+                    summary.Append("</td>");
                     summary.Append("</tr>");
                 }
                 else
                 {
                     summary.Append("<tr>");
-                    summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'>" +
-                                   p.PropertyType.Name + "</th>");
-                    summary.Append("<td style='text-align: left; vertical-align: top;'>" + newText + "</td>");
+                    summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'>");
+                    summary.Append(p.PropertyType.Name);
+                    summary.Append("</th>");
+                    summary.Append("<td style='text-align: left; vertical-align: top;'>");
+                    summary.Append(newText);
+                    summary.Append("</td>");
                     summary.Append("</tr>");
                 }
                 summary.Append(
@@ -338,29 +400,27 @@ namespace Umbraco.Core.Services
 
 
             string[] subjectVars = {
-                                       http.Request.ServerVariables["SERVER_NAME"] + ":" +
-                                       http.Request.Url.Port +
-                                       IOHelper.ResolveUrl(SystemDirectories.Umbraco), 
+                                       string.Concat(http.Request.ServerVariables["SERVER_NAME"], ":", http.Request.Url.Port, IOHelper.ResolveUrl(SystemDirectories.Umbraco)),
                                        actionName,
                                        content.Name
                                    };
             string[] bodyVars = {
-                                    mailingUser.Name, 
-                                    actionName, 
-                                    content.Name, 
+                                    mailingUser.Name,
+                                    actionName,
+                                    content.Name,
                                     performingUser.Name,
-                                    http.Request.ServerVariables["SERVER_NAME"] + ":" + http.Request.Url.Port + IOHelper.ResolveUrl(SystemDirectories.Umbraco),
+                                    string.Concat(http.Request.ServerVariables["SERVER_NAME"], ":", http.Request.Url.Port, IOHelper.ResolveUrl(SystemDirectories.Umbraco)),
                                     content.Id.ToString(CultureInfo.InvariantCulture), summary.ToString(),
                                     string.Format("{2}://{0}/{1}",
-                                                  http.Request.ServerVariables["SERVER_NAME"] + ":" + http.Request.Url.Port,
+                                                  string.Concat(http.Request.ServerVariables["SERVER_NAME"], ":", http.Request.Url.Port),
                                                   //TODO: RE-enable this so we can have a nice url
                                                   /*umbraco.library.NiceUrl(documentObject.Id))*/
-                                                  content.Id + ".aspx",
+                                                  string.Concat(content.Id, ".aspx"),
                                                   protocol)
-                                    
+
                                 };
 
-            // create the mail message 
+            // create the mail message
             var mail = new MailMessage(UmbracoConfig.For.UmbracoSettings().Content.NotificationEmailAddress, mailingUser.Email);
 
             // populate the message
@@ -374,10 +434,10 @@ namespace Umbraco.Core.Services
             {
                 mail.IsBodyHtml = true;
                 mail.Body =
-                    @"<html><head>
+                    string.Concat(@"<html><head>
 </head>
 <body style='font-family: Trebuchet MS, arial, sans-serif; font-color: black;'>
-" + createBody(mailingUser, bodyVars);
+", createBody(mailingUser, bodyVars));
             }
 
             // nh, issue 30724. Due to hardcoded http strings in resource files, we need to check for https replacements here
@@ -390,32 +450,17 @@ namespace Umbraco.Core.Services
                     string.Format("https://{0}", serverName));
             }
 
-
-            // send it  asynchronously, we don't want to got up all of the request time to send emails!
-            ThreadPool.QueueUserWorkItem(state =>
-                {
-                    try
-                    {
-                        using (mail)
-                        {
-                            using (var sender = new SmtpClient())
-                            {
-                                sender.Send(mail);
-                            }    
-                        }
-                        
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.Error<NotificationService>("An error occurred sending notification", ex);
-                    }
-                });
+            return new NotificationRequest(mail, actionName, mailingUser.Name, mailingUser.Email);
         }
 
         private static string ReplaceLinks(string text, HttpRequestBase request)
         {
-            string domain = GlobalSettings.UseSSL ? "https://" : "http://";
-            domain += request.ServerVariables["SERVER_NAME"] + ":" + request.Url.Port + "/";
+            var sb = new StringBuilder(GlobalSettings.UseSSL ? "https://" : "http://");
+            sb.Append(request.ServerVariables["SERVER_NAME"]);
+            sb.Append(":");
+            sb.Append(request.Url.Port);
+            sb.Append("/");
+            var domain = sb.ToString();
             text = text.Replace("href=\"/", "href=\"" + domain);
             text = text.Replace("src=\"/", "src=\"" + domain);
             return text;
@@ -484,7 +529,7 @@ namespace Umbraco.Core.Services
                         pos++;
                     } // while
                     sb.Append("</span>");
-                } // if                
+                } // if
             } // while
 
             // write rest of unchanged chars
@@ -495,8 +540,95 @@ namespace Umbraco.Core.Services
             } // while
 
             return sb.ToString();
+        }
+
+        // manage notifications
+        // ideally, would need to use IBackgroundTasks - but they are not part of Core!
+
+        private static readonly object Locker = new object();
+        private static readonly BlockingCollection<NotificationRequest> Queue = new BlockingCollection<NotificationRequest>();
+        private static volatile bool _running;
+
+        private void Enqueue(NotificationRequest notification)
+        {
+            Queue.Add(notification);
+            if (_running) return;
+            lock (Locker)
+            {
+                if (_running) return;
+                Process(Queue);
+                _running = true;
+            }
+        }
+
+        private class NotificationRequest
+        {
+            public NotificationRequest(MailMessage mail, string action, string userName, string email)
+            {
+                Mail = mail;
+                Action = action;
+                UserName = userName;
+                Email = email;
+            }
+
+            public MailMessage Mail { get; private set; }
+
+            public string Action { get; private set; }
+
+            public string UserName { get; private set; }
+
+            public string Email { get; private set; }
         }
 
+        private void Process(BlockingCollection<NotificationRequest> notificationRequests)
+        {
+            ThreadPool.QueueUserWorkItem(state =>
+            {
+                var s = new SmtpClient();
+                try
+                {
+                    _logger.Debug<NotificationService>("Begin processing notifications.");
+                    while (true)
+                    {
+                        NotificationRequest request;
+                        while (notificationRequests.TryTake(out request, 8 * 1000)) // stay on for 8s
+                        {
+                            try
+                            {
+                                if (Sendmail != null) Sendmail(s, request.Mail, _logger); else s.Send(request.Mail);
+                                _logger.Debug<NotificationService>(string.Format("Notification \"{0}\" sent to {1} ({2})", request.Action, request.UserName, request.Email));
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.Error<NotificationService>("An error occurred sending notification", ex);
+                                s.Dispose();
+                                s = new SmtpClient();
+                            }
+                            finally
+                            {
+                                request.Mail.Dispose();
+                            }
+                        }
+                        lock (Locker)
+                        {
+                            if (notificationRequests.Count > 0) continue; // last chance
+                            _running = false; // going down
+                            break;
+                        }
+                    }
+                }
+                finally
+                {
+                    s.Dispose();
+                }
+                _logger.Debug<NotificationService>("Done processing notifications.");
+            });
+        }
+
+        // for tests
+        internal static Action<SmtpClient, MailMessage, ILogger> Sendmail;
+            //= (_, msg, logger) => logger.Debug<NotificationService>("Email " + msg.To.ToString());
+
         #endregion
     }
 }

src/Umbraco.Core/Services/UserService.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Security;
 
@@ -506,6 +507,15 @@ namespace Umbraco.Core.Services
             }
         }
 
+        internal IEnumerable<IUser> GetNextUsers(int id, int count)
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = (UserRepository) RepositoryFactory.CreateUserRepository(uow))
+            {
+                return repository.GetNextUsers(id, count);
+            }
+        }
+
         #endregion
 
         #region Implementation of IUserService

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -142,7 +142,8 @@ namespace Umbraco.Core.Sync
                 ? ":" + request.ServerVariables["SERVER_PORT"]
                 : "";
 
-            var ssl = GlobalSettings.UseSSL ? "s" : ""; // force, whatever the first request
+            var useSsl = GlobalSettings.UseSSL || port == "443";
+            var ssl = useSsl ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
             appContext._umbracoApplicationUrl = url.TrimEnd('/');

src/Umbraco.Core/Umbraco.Core.csproj

@@ -37,12 +37,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
@@ -52,8 +52,8 @@
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.4.4.0\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.4.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.4.5.0\lib\net45\ImageProcessor.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
@@ -1452,6 +1452,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
   <!-- 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">

src/Umbraco.Core/UmbracoApplicationBase.cs

@@ -48,6 +48,9 @@ namespace Umbraco.Core
                 LogHelper.Error<UmbracoApplicationBase>(msg, exception);
             };
 
+            // this only gets called when an assembly can't be resolved
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainOnAssemblyResolve;
+
             //boot up the application
             GetBootManager()
                 .Initialize()
@@ -58,6 +61,22 @@ namespace Umbraco.Core
             ApplicationEventsResolver.Current.Dispose();
         }
 
+        /// <summary>
+        /// Called when an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
+        /// This is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
+            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
+            if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
+                return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
+            return null;
+        }
+
         /// <summary>
         /// Initializes the Umbraco application
         /// </summary>

src/Umbraco.Core/XmlHelper.cs

@@ -35,7 +35,7 @@ namespace Umbraco.Core
                 return;
             }
             if (n.Attributes[name] == null)
-            {                
+            {
                 var a = xml.CreateAttribute(name);
                 a.Value = value;
                 n.Attributes.Append(a);
@@ -155,7 +155,7 @@ namespace Umbraco.Core
             elt = null;
             return false;
         }
-        
+
         /// <summary>
         /// Sorts the children of a parentNode.
         /// </summary>
@@ -163,7 +163,7 @@ namespace Umbraco.Core
         /// <param name="childNodesXPath">An XPath expression to select children of <paramref name="parentNode"/> to sort.</param>
         /// <param name="orderBy">A function returning the value to order the nodes by.</param>
         internal static void SortNodes(
-            XmlNode parentNode, 
+            XmlNode parentNode,
             string childNodesXPath,
             Func<XmlNode, int> orderBy)
         {
@@ -227,7 +227,7 @@ namespace Umbraco.Core
         /// <param name="node">The child node to sort.</param>
         /// <param name="orderBy">A function returning the value to order the nodes by.</param>
         /// <returns>A value indicating whether sorting was needed.</returns>
-        /// <remarks>Assuming all nodes but <paramref name="node"/> are sorted, this will move the node to 
+        /// <remarks>Assuming all nodes but <paramref name="node"/> are sorted, this will move the node to
         /// the right position without moving all the nodes (as SortNodes would do) - should improve perfs.</remarks>
         internal static bool SortNode(
             XmlNode parentNode,
@@ -415,6 +415,25 @@ namespace Umbraco.Core
             return AddTextNode(xd, name, value);
         }
 
+        /// <summary>
+        /// Sets or creates an Xml node from its inner Xml.
+        /// </summary>
+        /// <param name="xd">The xmldocument.</param>
+        /// <param name="parent">The node to set or create the child text node on</param>
+        /// <param name="name">The node name.</param>
+        /// <param name="value">The node inner Xml.</param>
+        /// <returns>a XmlNode</returns>
+        public static XmlNode SetInnerXmlNode(XmlDocument xd, XmlNode parent, string name, string value)
+        {
+            if (xd == null) throw new ArgumentNullException("xd");
+            if (parent == null) throw new ArgumentNullException("parent");
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+
+            var child = parent.SelectSingleNode(name) ?? xd.CreateNode(XmlNodeType.Element, name, "");
+            child.InnerXml = value;
+            return child;
+        }
+
         /// <summary>
         /// Creates a cdata XmlNode with the specified name and value
         /// </summary>

src/Umbraco.Core/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.4.4.0" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.4.5.0" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net4" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />

src/Umbraco.Tests/Persistence/PetaPocoExpressionsTests.cs

@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Tests.Persistence
+{
+    [TestFixture]
+    public class PetaPocoExpressionsTests
+    {
+        [Test]
+        public void WhereInValueFieldTest()
+        {
+            var syntax = SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
+            var sql = new Sql()
+                .Select("*")
+                .From<NodeDto>(syntax)
+                .WhereIn<NodeDto>(x => x.NodeId, new[] { 1, 2, 3 }, syntax);
+            Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[id] IN (@0,@1,@2))", sql.SQL);
+        }
+
+        [Test]
+        public void WhereInObjectFieldTest()
+        {
+            // this test used to fail because x => x.Text was evaluated as a lambda
+            // and returned "[umbracoNode].[text] = @0"... had to fix WhereIn.
+
+            var syntax = SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
+            var sql = new Sql()
+                .Select("*")
+                .From<NodeDto>(syntax)
+                .WhereIn<NodeDto>(x => x.Text, new[] { "a", "b", "c" }, syntax);
+            Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[text] IN (@0,@1,@2))", sql.SQL);
+        }
+    }
+}

src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs

@@ -261,8 +261,17 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrl_SpecifiedCropModeTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode:ImageCropMode.Max);
-            Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlString);
+            var urlStringMin = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Min);
+            var urlStringBoxPad = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.BoxPad);
+            var urlStringPad = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Pad);
+            var urlStringMax = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Max);
+            var urlStringStretch = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Stretch);
+            
+            Assert.AreEqual(mediaPath + "?mode=min&width=300&height=150", urlStringMin);
+            Assert.AreEqual(mediaPath + "?mode=boxpad&width=300&height=150", urlStringBoxPad);
+            Assert.AreEqual(mediaPath + "?mode=pad&width=300&height=150", urlStringPad);
+            Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlStringMax);
+            Assert.AreEqual(mediaPath + "?mode=stretch&width=300&height=150", urlStringStretch);
         }
 
         /// <summary>

src/Umbraco.Tests/Services/ContentServiceTests.cs

@@ -68,6 +68,50 @@ namespace Umbraco.Tests.Services
             Assert.IsTrue(contentService.PublishWithStatus(content).Success);
         }
 
+        [Test]
+        public void Get_Top_Version_Ids()
+        {
+            // Arrange
+            var contentService = ServiceContext.ContentService;
+
+            // Act
+            var content = contentService.CreateContentWithIdentity("Test", -1, "umbTextpage", 0);
+            for (int i = 0; i < 20; i++)
+            {
+                content.SetValue("bodyText", "hello world " + Guid.NewGuid());
+                contentService.SaveAndPublishWithStatus(content);
+            }
+
+
+            // Assert
+            var allVersions = contentService.GetVersionIds(content.Id, int.MaxValue);
+            Assert.AreEqual(21, allVersions.Count());
+
+            var topVersions = contentService.GetVersionIds(content.Id, 4);
+            Assert.AreEqual(4, topVersions.Count());
+        }
+
+        [Test]
+        public void Get_By_Ids_Sorted()
+        {
+            // Arrange
+            var contentService = ServiceContext.ContentService;
+
+            // Act
+            var results = new List<IContent>();
+            for (int i = 0; i < 20; i++)
+            {
+                results.Add(contentService.CreateContentWithIdentity("Test", -1, "umbTextpage", 0));
+            }
+
+            var sortedGet = contentService.GetByIds(new[] {results[10].Id, results[5].Id, results[12].Id}).ToArray();
+
+            // Assert
+            Assert.AreEqual(sortedGet[0].Id, results[10].Id);
+            Assert.AreEqual(sortedGet[1].Id, results[5].Id);
+            Assert.AreEqual(sortedGet[2].Id, results[12].Id);
+        }
+
         [Test]
         public void Count_All()
         {

src/Umbraco.Tests/Services/ContentTypeServiceTests.cs

@@ -275,6 +275,35 @@ namespace Umbraco.Tests.Services
             Assert.That(success, Is.False);
         }
 
+        [Test]
+        public void Can_Delete_Parent_ContentType_When_Child_Has_Content()
+        {
+            var cts = ServiceContext.ContentTypeService;
+            var contentType = MockedContentTypes.CreateSimpleContentType("page", "Page", null, true);
+            cts.Save(contentType);
+            var childContentType = MockedContentTypes.CreateSimpleContentType("childPage", "Child Page", contentType, true, "Child Content");
+            cts.Save(childContentType);
+            var cs = ServiceContext.ContentService;
+            var content = cs.CreateContent("Page 1", -1, childContentType.Alias);
+            cs.Save(content);
+
+            cts.Delete(contentType);
+
+            Assert.IsNotNull(content.Id);
+            Assert.AreNotEqual(0, content.Id);
+            Assert.IsNotNull(childContentType.Id);
+            Assert.AreNotEqual(0, childContentType.Id);
+            Assert.IsNotNull(contentType.Id);
+            Assert.AreNotEqual(0, contentType.Id);
+            var deletedContent = cs.GetById(content.Id);
+            var deletedChildContentType = cts.GetContentType(childContentType.Id);
+            var deletedContentType = cts.GetContentType(contentType.Id);
+            
+            Assert.IsNull(deletedChildContentType);
+            Assert.IsNull(deletedContent);
+            Assert.IsNull(deletedContentType);
+        }
+
         [Test]
         public void Deleting_ContentType_Sends_Correct_Number_Of_DeletedEntities_In_Events()
         {

src/Umbraco.Tests/TestHelpers/TestHelper.cs

@@ -142,7 +142,13 @@ namespace Umbraco.Tests.TestHelpers
                 }
                 else if (dateTimeFormat.IsNullOrWhiteSpace() == false && actualValue is DateTime)
                 {
-                    Assert.AreEqual(((DateTime) expectedValue).ToString(dateTimeFormat), ((DateTime)actualValue).ToString(dateTimeFormat), "Property {0}.{1} does not match. Expected: {2} but was: {3}", property.DeclaringType.Name, property.Name, expectedValue, actualValue);
+                    // round to second else in some cases tests can fail ;-(
+                    var expectedDateTime = (DateTime) expectedValue;
+                    expectedDateTime = expectedDateTime.AddTicks(-(expectedDateTime.Ticks%TimeSpan.TicksPerSecond));
+                    var actualDateTime = (DateTime) actualValue;
+                    actualDateTime = actualDateTime.AddTicks(-(actualDateTime.Ticks % TimeSpan.TicksPerSecond));
+
+                    Assert.AreEqual(expectedDateTime.ToString(dateTimeFormat), actualDateTime.ToString(dateTimeFormat), "Property {0}.{1} does not match. Expected: {2} but was: {3}", property.DeclaringType.Name, property.Name, expectedValue, actualValue);
                 }
                 else
                 {

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -51,16 +51,16 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Examine, Version=0.1.69.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.69.0\lib\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.70.0\lib\Examine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
@@ -177,6 +177,7 @@
   <ItemGroup>
     <Compile Include="Migrations\MigrationIssuesTests.cs" />
     <Compile Include="Persistence\Migrations\MigrationStartupHandlerTests.cs" />
+    <Compile Include="Persistence\PetaPocoExpressionsTests.cs" />
     <Compile Include="Persistence\Repositories\RedirectUrlRepositoryTests.cs" />
     <Compile Include="TestHelpers\Entities\MockedPropertyTypes.cs" />
     <Compile Include="TryConvertToTests.cs" />
@@ -764,6 +765,7 @@
 xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
   <!-- 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">

src/Umbraco.Tests/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.69.0" targetFramework="net45" />
+  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
+  <package id="Examine" version="0.1.70.0" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />

src/Umbraco.Web.UI.Client/bower.json

@@ -22,6 +22,7 @@
     "bootstrap-social": "~4.8.0",
     "jquery": "2.2.4",
     "jquery-ui": "1.11.4",
+    "jquery-migrate": "1.4.0",
     "angular-dynamic-locale": "0.1.28",
     "ng-file-upload": "~7.3.8",
     "tinymce": "~4.1.10",

src/Umbraco.Web.UI.Client/gruntFile.js

@@ -491,6 +491,10 @@ module.exports = function (grunt) {
                             keepExpandedHierarchy: false,
                             files: ['jquery-ui.min.js']
                         },
+                        'jquery-migrate': {
+                            keepExpandedHierarchy: false,
+                            files: ['jquery-migrate.min.js']
+                        },
                         'tinymce': {
                             files: ['plugins/**', 'themes/**', 'tinymce.min.js']
                         },

src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js

@@ -118,9 +118,13 @@ angular.module("umbraco.directives")
                             $timeout(function(){
                                 setDimensions();
                             });
-							var offsetX = $overlay[0].offsetLeft;
-							var offsetY = $overlay[0].offsetTop;
-                            calculateGravity(offsetX, offsetY);
+							// Make sure we can find the offset values for the overlay(dot) before calculating
+							// fixes issue with resize event when printing the page (ex. hitting ctrl+p inside the rte)
+							if($overlay.is(':visible')) {
+								var offsetX = $overlay[0].offsetLeft;
+								var offsetY = $overlay[0].offsetTop;
+								calculateGravity(offsetX, offsetY);
+							}
                         });
                     });
 

src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js

@@ -20,6 +20,8 @@ angular.module("umbraco.directives")
                 var curr = $(event.target);         // active tab
                 var prev = $(event.relatedTarget);  // previous tab
 
+				$scope.$apply();
+
                 for (var c in callbacks) {
                     callbacks[c].apply(this, [{current: curr, previous: prev}]);
                 }

src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js

@@ -58,7 +58,7 @@ angular.module('umbraco.mocks').
 						"view": "textstring",
 						"icon": "icon-quote",
 						"config": {
-							"style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
+							"style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
 							"markup": "<blockquote>#value#</blockquote>"
 						}
 					}

src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js

@@ -134,7 +134,7 @@ angular.module('umbraco.mocks').
                   "content_nodeName": "Page Title",
                   "content_otherElements": "Properties",
                   "content_parentNotPublished": "This document is published but is not visible because the parent '%0%' is unpublished",
-                  "content_parentNotPublishedAnomaly": "Oops: this document is published but is not in the cache (internal error)",
+                  "content_parentNotPublishedAnomaly": "This document is published but is not in the cache",
                   "content_publish": "Publish",
                   "content_publishStatus": "Publication Status",
                   "content_releaseDate": "Publish at",

src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js

@@ -20,7 +20,6 @@ function dashboardResource($q, $http, umbRequestHelper) {
          *
          */
         getDashboard: function (section) {
-          
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
@@ -28,7 +27,53 @@ function dashboardResource($q, $http, umbRequestHelper) {
                         "GetDashboard",
                         [{ section: section }])),
                 'Failed to get dashboard ' + section);
+        },
+
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.dashboardResource#getRemoteDashboardContent
+        * @methodOf umbraco.resources.dashboardResource
+        *
+        * @description
+        * Retrieves dashboard content from a remote source for a given section
+        * 
+        * @param {string} section Alias of section to retrieve dashboard content for
+        * @returns {Promise} resourcePromise object containing the user array.
+        *
+        */
+        getRemoteDashboardContent: function (section, baseurl) {
+
+            //build request values with optional params
+            var values = [{ section: section }];
+            if (baseurl)
+            {
+                values.push({ baseurl: baseurl });
+            }
+
+            return  umbRequestHelper.resourcePromise(
+                    $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "dashboardApiBaseUrl",
+                        "GetRemoteDashboardContent",
+                        values)), "Failed to get dashboard content");
+        },
+
+        getRemoteDashboardCssUrl: function (section, baseurl) {
+
+            //build request values with optional params
+            var values = [{ section: section }];
+            if (baseurl) {
+                values.push({ baseurl: baseurl });
+            }
+
+            return umbRequestHelper.getApiUrl(
+                        "dashboardApiBaseUrl",
+                        "GetRemoteDashboardCss",
+                        values);
         }
+
+
+
     };
 }
 

src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js

@@ -111,7 +111,7 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
                   umbRequestHelper.getApiUrl(
                       "packageInstallApiBaseUrl",
                       "Import"), package),
-              'Failed to create package manifest for zip file ');
+              'Failed to install package. Error during the step "Import" ');
         }, 
 
         installFiles: function (package) {
@@ -120,7 +120,7 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
                   umbRequestHelper.getApiUrl(
                       "packageInstallApiBaseUrl",
                       "InstallFiles"), package),
-              'Failed to create package manifest for zip file ');
+              'Failed to install package. Error during the step "InstallFiles" ');
         }, 
 
         installData: function (package) {
@@ -130,7 +130,7 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
                   umbRequestHelper.getApiUrl(
                       "packageInstallApiBaseUrl",
                       "InstallData"), package),
-              'Failed to create package manifest for zip file ');
+              'Failed to install package. Error during the step "InstallData" ');
         }, 
 
         cleanUp: function (package) {
@@ -140,7 +140,7 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
                   umbRequestHelper.getApiUrl(
                       "packageInstallApiBaseUrl",
                       "CleanUp"), package),
-              'Failed to create package manifest for zip file ');
+              'Failed to install package. Error during the step "CleanUp" ');
         }
     };
 }

src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js

@@ -41,13 +41,13 @@
                 'Failed to retrieve data for searching redirect urls');
         }
 
-        function isEnabled() {
+        function getEnableState() {
 
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
                         "redirectUrlManagementApiBaseUrl",
-                        "IsEnabled")),
+                        "GetEnableState")),
                 'Failed to retrieve data to check if the 301 redirect is enabled');
         }
 
@@ -107,7 +107,7 @@
             searchRedirectUrls: searchRedirectUrls,
             deleteRedirectUrl: deleteRedirectUrl,
             toggleUrlTracker: toggleUrlTracker,
-            isEnabled: isEnabled
+            getEnableState: getEnableState
         };
 
         return resource;

src/Umbraco.Web.UI.Client/src/common/security/retryqueue.js

@@ -5,10 +5,12 @@ angular.module('umbraco.security.retryQueue', [])
 .factory('securityRetryQueue', ['$q', '$log', function ($q, $log) {
 
   var retryQueue = [];
+  var retryUser = null;
+
   var service = {
     // The security service puts its own handler in here!
     onItemAddedCallbacks: [],
-    
+
     hasMore: function() {
       return retryQueue.length > 0;
     },
@@ -23,13 +25,20 @@ angular.module('umbraco.security.retryQueue', [])
         }
       });
     },
-    pushRetryFn: function(reason, retryFn) {
+    pushRetryFn: function(reason, userName, retryFn) {
       // The reason parameter is optional
-      if ( arguments.length === 1) {
-        retryFn = reason;
+      if ( arguments.length === 2) {
+        retryFn = userName;
+        userName = reason;
         reason = undefined;
       }
 
+      if ((retryUser && retryUser !== userName) || userName === null) {
+        throw new Error('invalid user');
+      }
+      
+      retryUser = userName;
+
       // The deferred object that will be resolved or rejected by calling retry or cancel
       var deferred = $q.defer();
       var retryItem = {
@@ -59,8 +68,19 @@ angular.module('umbraco.security.retryQueue', [])
       while(service.hasMore()) {
         retryQueue.shift().cancel();
       }
+      retryUser = null;
     },
-    retryAll: function() {
+    retryAll: function (userName) {
+
+      if (retryUser == null) {
+        return;
+      } 
+      
+      if (retryUser !== userName) {
+        service.cancelAll();
+        return;
+      }
+
       while(service.hasMore()) {
         retryQueue.shift().retry();
       }

src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js

@@ -6,7 +6,7 @@ angular.module('umbraco.security.interceptor')
             return promise.then(
                 function(originalResponse) {
                     // Intercept successful requests
-                    
+
                     //Here we'll check if our custom header is in the response which indicates how many seconds the user's session has before it
                     //expires. Then we'll update the user in the user service accordingly.
                     var headers = originalResponse.headers();
@@ -15,11 +15,11 @@ angular.module('umbraco.security.interceptor')
                         var userService = $injector.get('userService');
                         userService.setUserTimeout(headers["x-umb-user-seconds"]);
                     }
-                    
+
                     return promise;
                 }, function(originalResponse) {
                     // Intercept failed requests
-                    
+
                     //Here we'll check if we should ignore the error, this will be based on an original header set
                     var headers = originalResponse.config ? originalResponse.config.headers : {};
                     if (headers["x-umb-ignore-error"] === "ignore") {
@@ -36,17 +36,24 @@ angular.module('umbraco.security.interceptor')
                     //A 401 means that the user is not logged in
                     if (originalResponse.status === 401) {
 
-                        // The request bounced because it was not authorized - add a new request to the retry queue
-                        promise = queue.pushRetryFn('unauthorized-server', function retryRequest() {
+                      var userService = $injector.get('userService'); // see above
+
+                      //Associate the user name with the retry to ensure we retry for the right user
+                      promise = userService.getCurrentUser()
+                        .then(function (user) {
+                          var userName = user ? user.name : null;
+                          //The request bounced because it was not authorized - add a new request to the retry queue
+                          return queue.pushRetryFn('unauthorized-server', userName, function retryRequest() {
                             // We must use $injector to get the $http service to prevent circular dependency
                             return $injector.get('$http')(originalResponse.config);
+                          });
                         });
                     }
                     else if (originalResponse.status === 404) {
 
                         //a 404 indicates that the request was not found - this could be due to a non existing url, or it could
                         //be due to accessing a url with a parameter that doesn't exist, either way we should notifiy the user about it
-                        
+
                         var errMsg = "The URL returned a 404 (not found): <br/><i>" + originalResponse.config.url.split('?')[0] + "</i>";
                         if (originalResponse.data && originalResponse.data.ExceptionMessage) {
                             errMsg += "<br/> with error: <br/><i>" + originalResponse.data.ExceptionMessage + "</i>";
@@ -58,17 +65,17 @@ angular.module('umbraco.security.interceptor')
                         notifications.error(
                             "Request error",
                             errMsg);
-                        
+
                     }
                     else if (originalResponse.status === 403) {
                         //if the status was a 403 it means the user didn't have permission to do what the request was trying to do.
-                        //How do we deal with this now, need to tell the user somehow that they don't have permission to do the thing that was 
+                        //How do we deal with this now, need to tell the user somehow that they don't have permission to do the thing that was
                         //requested. We can either deal with this globally here, or we can deal with it globally for individual requests on the umbRequestHelper,
                         // or completely custom for services calling resources.
 
                         //http://issues.umbraco.org/issue/U4-2749
 
-                        //It was decided to just put these messages into the normal status messages. 
+                        //It was decided to just put these messages into the normal status messages.
 
                         var msg = "Unauthorized access to URL: <br/><i>" + originalResponse.config.url.split('?')[0] + "</i>";
                         if (originalResponse.config.data) {

src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js

@@ -354,7 +354,7 @@ angular.module('umbraco.services')
          * @description
          * Opens a content picker tree in a modal, the callback returns an array of selected documents
          * @param {Object} options content picker dialog options object
-         * @param {Boolean} options.multipicker should the picker return one or multiple items
+         * @param {Boolean} options.multiPicker should the picker return one or multiple items
          * @param {Function} options.callback callback function
          * @returns {Object} modal object
          */

src/Umbraco.Web.UI.Client/src/common/services/user.service.js

@@ -31,7 +31,7 @@ angular.module('umbraco.services')
             loginDialog = null;
 
             if (success) {
-                securityRetryQueue.retryAll();
+                securityRetryQueue.retryAll(currentUser.name);
             }
             else {
                 securityRetryQueue.cancelAll();
@@ -39,9 +39,9 @@ angular.module('umbraco.services')
             }
         }
 
-        /** 
-        This methods will set the current user when it is resolved and 
-        will then start the counter to count in-memory how many seconds they have 
+        /**
+        This methods will set the current user when it is resolved and
+        will then start the counter to count in-memory how many seconds they have
         remaining on the auth session
         */
         function setCurrentUser(usr) {
@@ -54,8 +54,8 @@ angular.module('umbraco.services')
             countdownUserTimeout();
         }
 
-        /** 
-        Method to count down the current user's timeout seconds, 
+        /**
+        Method to count down the current user's timeout seconds,
         this will continually count down their current remaining seconds every 5 seconds until
         there are no more seconds remaining.
         */
@@ -70,8 +70,8 @@ angular.module('umbraco.services')
                     //if there are more than 30 remaining seconds, recurse!
                     if (currentUser.remainingAuthSeconds > 30) {
 
-                        //we need to check when the last time the timeout was set from the server, if 
-                        // it has been more than 30 seconds then we'll manually go and retrieve it from the 
+                        //we need to check when the last time the timeout was set from the server, if
+                        // it has been more than 30 seconds then we'll manually go and retrieve it from the
                         // server - this helps to keep our local countdown in check with the true timeout.
                         if (lastServerTimeoutSet != null) {
                             var now = new Date();
@@ -79,7 +79,7 @@ angular.module('umbraco.services')
 
                             if (seconds > 30) {
 
-                                //first we'll set the lastServerTimeoutSet to null - this is so we don't get back in to this loop while we 
+                                //first we'll set the lastServerTimeoutSet to null - this is so we don't get back in to this loop while we
                                 // wait for a response from the server otherwise we'll be making double/triple/etc... calls while we wait.
                                 lastServerTimeoutSet = null;
 
@@ -98,7 +98,7 @@ angular.module('umbraco.services')
                     }
                     else {
 
-                        //we are either timed out or very close to timing out so we need to show the login dialog.                                        
+                        //we are either timed out or very close to timing out so we need to show the login dialog.
                         if (Umbraco.Sys.ServerVariables.umbracoSettings.keepUserLoggedIn !== true) {
                             //NOTE: the safeApply because our timeout is set to not run digests (performance reasons)
                             angularHelper.safeApply($rootScope, function () {
@@ -109,14 +109,14 @@ angular.module('umbraco.services')
                                 }
                                 finally {
                                     userAuthExpired();
-                                } 
+                                }
                             });
                         }
                         else {
                             //we've got less than 30 seconds remaining so let's check the server
 
                             if (lastServerTimeoutSet != null) {
-                                //first we'll set the lastServerTimeoutSet to null - this is so we don't get back in to this loop while we 
+                                //first we'll set the lastServerTimeoutSet to null - this is so we don't get back in to this loop while we
                                 // wait for a response from the server otherwise we'll be making double/triple/etc... calls while we wait.
                                 lastServerTimeoutSet = null;
 
@@ -211,8 +211,8 @@ angular.module('umbraco.services')
                         return result;
                     });
             },
-          
-            /** Logs the user out 
+
+            /** Logs the user out
              */
             logout: function () {
 

src/Umbraco.Web.UI.Client/src/config/grid.editors.config.js

@@ -39,7 +39,7 @@
 	    "view": "textstring",
 	    "icon": "icon-quote",
 	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
+	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
 	        "markup": "<blockquote>#value#</blockquote>"
 	    }
 	}

src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html

@@ -12,7 +12,7 @@
         <li class="span3" ng-repeat="pck in packages">
             <a href ng-click="setPackageAndContinue(pck.id)" class="thumbnail">
                 <small>Loading...</small>
-                <img ng-src="http://our.umbraco.org{{pck.thumbnail}}" alt="{{pck.name}}">
+                <img ng-src="http://our.umbraco.org{{pck.thumbnail}}?width=170" alt="{{pck.name}}">
             </a>
         </li>
     </ul>

src/Umbraco.Web.UI.Client/src/less/components/umb-table.less

@@ -243,7 +243,7 @@ input.umb-table__input {
     text-overflow: ellipsis;
 }
 
-.umb-table-cell:first-of-type {
+.umb-table-cell:first-of-type:not(.not-fixed) {
     flex: 0 0 25px;
 
     margin: 0 0 0 15px;

src/Umbraco.Web.UI.Client/src/less/healthcheck.less

@@ -151,6 +151,15 @@
 	background-color: @blueDark;
 }
 
+.umb-era-button.-red {
+	background: @btnDangerBackground;
+	color: white;
+}
+
+.umb-era-button.-red:hover {
+	background-color: darken(@btnDangerBackground, 5%);
+}
+
 .umb-era-button.-link {
 	padding: 0;
     background: transparent;

src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less

@@ -1,37 +1,96 @@
 /*
+
     Flexbox
+
 */
 
+.flex { display: flex; }
+.flex-inline { display: inline-flex; }
 
-.flex { display: flex }
+.flex-column  { flex-direction: column; }
+.flex-wrap    { flex-wrap: wrap; }
 
-.flex-column  { flex-direction: column }
-.flex-wrap    { flex-wrap: wrap }
+.items-start    { align-items: flex-start; }
+.items-end      { align-items: flex-end; }
+.items-center   { align-items: center; }
+.items-baseline { align-items: baseline; }
+.items-stretch  { align-items: stretch; }
 
-.items-start    { align-items: flex-start }
-.items-end      { align-items: flex-end }
-.items-center   { align-items: center }
-.items-baseline { align-items: baseline }
-.items-stretch  { align-items: stretch }
+.self-start    { align-self: flex-start; }
+.self-end      { align-self: flex-end; }
+.self-center   { align-self: center; }
+.self-baseline { align-self: baseline; }
+.self-stretch  { align-self: stretch; }
 
-.self-start    { align-self: flex-start }
-.self-end      { align-self: flex-end }
-.self-center   { align-self: center }
-.self-baseline { align-self: baseline }
-.self-stretch  { align-self: stretch }
+.justify-start   { justify-content: flex-start; }
+.justify-end     { justify-content: flex-end; }
+.justify-center  { justify-content: center; }
+.justify-between { justify-content: space-between; }
+.justify-around  { justify-content: space-around; }
 
-.justify-start   { justify-content: flex-start }
-.justify-end     { justify-content: flex-end }
-.justify-center  { justify-content: center }
-.justify-between { justify-content: space-between }
-.justify-around  { justify-content: space-around }
+.content-start   { align-content: flex-start; }
+.content-end     { align-content: flex-end; }
+.content-center  { align-content: center; }
+.content-between { align-content: space-between; }
+.content-around  { align-content: space-around; }
+.content-stretch { align-content: stretch; }
 
-.content-start   { align-content: flex-start }
-.content-end     { align-content: flex-end }
-.content-center  { align-content: center }
-.content-between { align-content: space-between }
-.content-around  { align-content: space-around }
-.content-stretch { align-content: stretch }
+.flx-i {
+  flex: 1;
+}
+
+
+.flx-g0 {
+  flex-grow: 0;
+}
+.flx-g1 {
+  flex-grow: 1;
+}
+
+.flx-s0 {
+  flex-shrink: 0;
+}
+.flx-s1 {
+  flex-shrink: 1;
+}
+
+
+.flx-b0 {
+  flex-basis: 0%;
+}
+.flx-b1 {
+  flex-basis: 10%;
+}
+.flx-b2 {
+  flex-basis: 20%;
+}
+.flx-b3 {
+  flex-basis: 30%;
+}
+.flx-b4 {
+  flex-basis: 40%;
+}
+.flx-b5 {
+  flex-basis: 50%;
+}
+.flx-b6 {
+  flex-basis: 60%;
+}
+.flx-b7 {
+  flex-basis: 70%;
+}
+.flx-b8 {
+  flex-basis: 80%;
+}
+.flx-b9 {
+  flex-basis: 90%;
+}
+.flx-b10 {
+  flex-basis: 100%;
+}
+.flx-ba {
+  flex-basis: auto;
+}
 
 /* 1. Fix for Chrome 44 bug. https://code.google.com/p/chromium/issues/detail?id=506893 */
 .flex-auto {
@@ -40,4 +99,4 @@
   min-height: 0; /* 1 */
 }
 
-.flex-none { flex: none }
+.flex-none { flex: none; }

src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html

@@ -12,10 +12,10 @@
             <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension == 'svg'"></div>
 
             <!-- Image thumbnail -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" title="{{item.name}}" draggable="false" />
 
             <!-- SVG -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension == 'svg'" ng-src="{{item.file}}" alt="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension == 'svg'" ng-src="{{item.file}}" alt="{{item.name}}" title="{{item.name}}" draggable="false" />
 
             <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
             <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension != 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />

src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html

@@ -36,7 +36,7 @@
     </div>
 
     <!-- List of uploading/uploaded files  -->
-    <ul class="file-list" ng-show="done.length > 0 || queue.length > 0 || rejected.length > 0">
+    <ul class="file-list" ng-show="done.length > 0 || queue.length > 0 || rejected.length > 0 || filesHolder.length > 0">
 
         <!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
         <li class="file" ng-repeat="file in done">

src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

@@ -14,9 +14,42 @@ function startUpVideosDashboardController($scope, xmlhelper, $log, $http) {
         });
     };
 }
+
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController);
 
 
+function startUpDynamicContentController(dashboardResource, assetsService) {
+    var vm = this;
+    vm.loading = true;
+    vm.showDefault = false;
+    
+    //proxy remote css through the local server
+    assetsService.loadCss( dashboardResource.getRemoteDashboardCssUrl("content") );
+    dashboardResource.getRemoteDashboardContent("content").then(
+        function (data) {
+
+            vm.loading = false;
+
+            //test if we have received valid data
+            //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code
+            if (data && data.sections) {
+                vm.dashboard = data;
+            } else{
+                vm.showDefault = true;
+            }
+
+        },
+
+        function (exception) {
+            console.error(exception);
+            vm.loading = false;
+            vm.showDefault = true;
+        });
+}
+
+angular.module("umbraco").controller("Umbraco.Dashboard.StartUpDynamicContentController", startUpDynamicContentController);
+
+
 function FormsController($scope, $route, $cookieStore, packageResource, localizationService) {
     $scope.installForms = function(){
         $scope.state = localizationService.localize("packager_installStateDownloading");
@@ -192,27 +225,43 @@ function startupLatestEditsController($scope) {
 }
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController);
 
-function MediaFolderBrowserDashboardController($rootScope, $scope, contentTypeResource) {
+function MediaFolderBrowserDashboardController($rootScope, $scope, $location, contentTypeResource, userService) {
 
-    //get the system media listview
-    contentTypeResource.getPropertyTypeScaffold(-96)
-        .then(function(dt) {
+    var currentUser = {};
 
-            $scope.fakeProperty = {
-                alias: "contents",
-                config: dt.config,
-                description: "",
-                editor: dt.editor,
-                hideLabel: true,
-                id: 1,
-                label: "Contents:",
-                validation: {
-                    mandatory: false,
-                    pattern: null
-                },
-                value: "",
-                view: dt.view
-            };
+    userService.getCurrentUser().then(function (user) {
+
+        currentUser = user;
+
+        // check if the user start node is the dashboard
+        if(currentUser.startMediaId === -1) {
+
+            //get the system media listview
+            contentTypeResource.getPropertyTypeScaffold(-96)
+                .then(function(dt) {
+
+                    $scope.fakeProperty = {
+                        alias: "contents",
+                        config: dt.config,
+                        description: "",
+                        editor: dt.editor,
+                        hideLabel: true,
+                        id: 1,
+                        label: "Contents:",
+                        validation: {
+                            mandatory: false,
+                            pattern: null
+                        },
+                        value: "",
+                        view: dt.view
+                    };
+
+            });
+
+        } else {
+            // redirect to start node
+            $location.path("/media/media/edit/" + currentUser.startMediaId);
+        }
 
     });
 

src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html

@@ -1,44 +1,95 @@
+<div class="umb-dashboard-grid" ng-controller="Umbraco.Dashboard.StartUpDynamicContentController as vm">
 
-<div style="max-width: 1200px">
-<h3><strong>Welcome to The Friendly CMS</strong></h3>
-<p style="font-size: 16px; line-height: 1.5; margin-bottom: 30px; max-width: 760px;">Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible:</p>
+    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
-<div class="row">
-    <div class="span4">
-        <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv" target="_blank" class="nounderline">
-            <img src="views/dashboard/default/umbracotv.png" alt="Umbraco.TV - Hours of Umbraco Video Tutorials" style="margin: 10px 0 10px 0"/>
-        </a>
+    <div class="row clearfix" ng-if="vm.dashboard">
+        <!-- Sections -->
+        <div class="grid-section" ng-repeat="section in vm.dashboard.sections">
+            <div class="{{'span' + section.grid + ' column dash-section'}}">
 
+                <!-- rows -->
+                <div class="row clearfix dash-row" ng-repeat="row in section.rows">
+                    <div class="dash-inner-row">
 
-         <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=tv" target="_blank" class="btn-link -underline">
-             <h4> <strong>Umbraco.TV - Learn from the source!</strong> </h4>
-        </a>
+                        <!-- areas -->
+                        <div ng-repeat="area in row.areas"
+                             class="{{'span' + area.grid + ' column dash-area'}}">
+                            <div class="dash-inner-area">
 
-        <p style="line-height: 1.5;">
-            Umbraco.TV will help you go from zero to Umbraco
-            hero at a pace that suits you. Our easy to follow
-            online training videos will give you the fundamental
-            knowledge to start building awesome Umbraco websites.
-        </p>
+                                <!-- Controls -->
+                                <div ng-repeat="control in area.controls" class="dash-control dash-control-{{control.alias}}">
+                                    <div class="dash-inner-control">
+                                        <div ng-bind-html-unsafe="control.html"></div>
+                                    </div>
+                                </div>
+                                <!-- Controls end -->
+                            </div>
+                        </div>
+                        <!-- Area end -->
+                    </div>
+                </div>
+            </div>
+            <!-- Section end -->
+
+        </div>
     </div>
+    <!-- grid container end -->
 
-    <div class="span4 offset1">
 
-        <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our" target="_blank" class="nounderline">
-            <img src="views/dashboard/default/ourumbraco.png" alt="Our Umbraco" style="margin: 10px 0 10px 0"/>
-        </a>
+    <!-- Default content in case we cannot fetch content from the outside -->
+    <div style="max-width: 1200px" ng-if="vm.showDefault">
+        <h3><strong>Welcome to The Friendly CMS</strong></h3>
+        <p style="font-size: 16px; line-height: 1.5; margin-bottom: 30px; max-width: 760px;">
+            <span>Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</span>
+        </p>
+        <h4>Find out more:</h4>
+        <ul>
+            <li>Find the answers to your Umbraco questions in <a href="https://our.umbraco.org/documentation/" target="_blank" class="btn-link-underline">our Documentation</a></li>
+            <li>Ask a question in the <a href="https://our.umbraco.org" target="_blank" class="btn-link-underline">Community Forum</a></li>
+            <li>Find <a href="https://our.umbraco.org/projects" target="_blank" class="btn-link-underline">an add-on package</a> to help you get going quickly</li>
+            <li>Watch <a href="https://umbraco.tv" class="btn-link-underline">our tutorial videos</a> (some are free, some require a subscription)</li>
+            <li>Find out about <a href="https://umbraco.com/products-and-support" target="_blank" class="btn-link-underline">our productivity boosting tools and commercial support</a></li>
+            <li>Find out about <a href="https://umbraco.com/products/training" target="_blank" class="btn-link-underline">real-life training and certification opportunities</a></li>
+        </ul>            
 
-        <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=our" target="_blank" class="btn-link -underline">
-            <h4><strong>Our Umbraco - The Friendliest Community</strong></h4>
-        </a>
+        <div class="row">
+            <div class="span4">
+                <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv" target="_blank" class="nounderline">
+                    <img src="views/dashboard/default/umbracotv.png" alt="Umbraco.TV - Hours of Umbraco Video Tutorials" style="margin: 10px 0 10px 0" />
+                </a>
 
-        <p style="line-height: 1.5;">
-            Our Umbraco - the official community site is your one
-            stop for everything Umbraco. Whether you need a
-            question answered or looking for cool plugins, the
-            worlds best community is just a click away.
-        </p>
-    </div>
-</div>
 
-</div>
+                <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=tv" target="_blank" class="btn-link -underline">
+                    <h4> <strong>Umbraco.TV - Learn from the source!</strong> </h4>
+                </a>
+
+                <p style="line-height: 1.5;">
+                    Umbraco.TV will help you go from zero to Umbraco
+                    hero at a pace that suits you. Our easy to follow
+                    online training videos will give you the fundamental
+                    knowledge to start building awesome Umbraco websites.
+                </p>
+            </div>
+
+            <div class="span4 offset1">
+
+                <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our" target="_blank" class="nounderline">
+                    <img src="views/dashboard/default/ourumbraco.png" alt="Our Umbraco" style="margin: 10px 0 10px 0" />
+                </a>
+
+                <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=our" target="_blank" class="btn-link -underline">
+                    <h4><strong>Our Umbraco - The Friendliest Community</strong></h4>
+                </a>
+
+                <p style="line-height: 1.5;">
+                    Our Umbraco - the official community site is your one
+                    stop for everything Umbraco. Whether you need a
+                    question answered or looking for cool plugins, the
+                    worlds best community is just a click away.
+                </p>
+
+            </div>
+        </div>
+    </div> 
+
+</div>

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js

@@ -1,7 +1,7 @@
 (function() {
     "use strict";
 
-    function RedirectUrlsController($scope, redirectUrlsResource, notificationsService, $q) {
+    function RedirectUrlsController($scope, redirectUrlsResource, notificationsService, localizationService, $q) {
         //...todo
         //search by url or url part
         //search by domain
@@ -14,7 +14,8 @@
         vm.dashboard = {
             searchTerm: "",
             loading: false,
-            urlTrackerDisabled: false
+            urlTrackerDisabled: false,
+            userIsAdmin: false
         };
 
         vm.pagination = {
@@ -40,8 +41,9 @@
 
         function checkEnabled() {
             vm.dashboard.loading = true;
-            return redirectUrlsResource.isEnabled().then(function (response) {
-                vm.dashboard.urlTrackerDisabled = response !== "true";
+            return redirectUrlsResource.getEnableState().then(function (response) {
+                vm.dashboard.urlTrackerDisabled = response.enabled !== true;
+                vm.dashboard.userIsAdmin = response.userIsAdmin;
                 vm.dashboard.loading = false;
             });
         }
@@ -76,53 +78,56 @@
         }
 
         function removeRedirect(redirectToDelete) {
-            var toggleConfirm = confirm('Are you sure you want to remove the redirect from ' + '"' + redirectToDelete.originalUrl + '"' + " to " + '"' + redirectToDelete.destinationUrl + '"' + " ?");
+            localizationService.localize("redirectUrls_confirmRemove", [redirectToDelete.originalUrl, redirectToDelete.destinationUrl]).then(function (value) {
+                var toggleConfirm = confirm(value);
 
-            if (toggleConfirm) {
-                redirectUrlsResource.deleteRedirectUrl(redirectToDelete.redirectId).then(function () {
+                if (toggleConfirm) {
+                    redirectUrlsResource.deleteRedirectUrl(redirectToDelete.redirectId).then(function () {
 
-                    var index = vm.redirectUrls.indexOf(redirectToDelete);
-                    vm.redirectUrls.splice(index, 1);
-                    notificationsService.success("Redirect Url Removed!", "Redirect Url has been deleted");
+                        var index = vm.redirectUrls.indexOf(redirectToDelete);
+                        vm.redirectUrls.splice(index, 1);
+                        notificationsService.success(localizationService.localize("redirectUrls_redirectRemoved"));
 
-                    // check if new redirects needs to be loaded
-                    if(vm.redirectUrls.length === 0 && vm.pagination.totalPages > 1) {
+                        // check if new redirects needs to be loaded
+                        if (vm.redirectUrls.length === 0 && vm.pagination.totalPages > 1) {
 
-                        // if we are not on the first page - get records from the previous
-                        if(vm.pagination.pageIndex > 0 ) {
-                            vm.pagination.pageIndex = vm.pagination.pageIndex - 1;
-                            vm.pagination.pageNumber = vm.pagination.pageNumber - 1;
+                            // if we are not on the first page - get records from the previous
+                            if (vm.pagination.pageIndex > 0) {
+                                vm.pagination.pageIndex = vm.pagination.pageIndex - 1;
+                                vm.pagination.pageNumber = vm.pagination.pageNumber - 1;
+                            }
+
+                            search();
                         }
-
-                        search();
-                    }
-
-                }, function(error) {
-                    notificationsService.error("Redirect Url Error!", "Redirect Url was not deleted");
-                });
-            }
+                    }, function (error) {
+                        notificationsService.error(localizationService.localize("redirectUrls_redirectRemoveError"));
+                    });
+                }
+            });
         }
 
         function disableUrlTracker() {
-            var toggleConfirm = confirm("Are you sure you want to disable the URL tracker?");
-            if (toggleConfirm) {
+            localizationService.localize("redirectUrls_confirmDisable").then(function(value) {
+                var toggleConfirm = confirm(value);
+                if (toggleConfirm) {
 
-                redirectUrlsResource.toggleUrlTracker(true).then(function() {
-                    activate();
-                    notificationsService.success("URL Tracker has now been disabled");
-                }, function(error) {
-                    notificationsService.warning("Error disabling the URL Tracker, more information can be found in your log file.");
-                });
+                    redirectUrlsResource.toggleUrlTracker(true).then(function () {
+                        activate();
+                        notificationsService.success(localizationService.localize("redirectUrls_disabledConfirm"));
+                    }, function (error) {
+                        notificationsService.warning(localizationService.localize("redirectUrls_disableError"));
+                    });
 
-            }
+                }
+            });
         }
 
         function enableUrlTracker() {
             redirectUrlsResource.toggleUrlTracker(false).then(function() {
                 activate();
-                notificationsService.success("URL Tracker has now been enabled");
+                notificationsService.success(localizationService.localize("redirectUrls_enabledConfirm"));
             }, function(error) {
-                notificationsService.warning("Error enabling the URL Tracker, more information can be found in your log file.");
+                notificationsService.warning(localizationService.localize("redirectUrls_enableError"));
             });
         }
 

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html

@@ -6,14 +6,14 @@
 
         <umb-editor-sub-header-content-right>
 
-            <umb-editor-sub-header-section>
+            <umb-editor-sub-header-section ng-if="vm.dashboard.userIsAdmin === true">
 
                 <button
                     ng-if="vm.dashboard.urlTrackerDisabled === false"
                     type="button"
                     class="umb-era-button umb-button--s"
                     ng-click="vm.disableUrlTracker()">
-                    <span>Disable URL Tracker</span>
+                    <span><localize key="redirectUrls_disableUrlTracker">Disable URL Tracker</localize></span>
                 </button>
 
                 <button
@@ -21,7 +21,7 @@
                     type="button"
                     class="umb-era-button umb-button--s -blue"
                     ng-click="vm.enableUrlTracker()">
-                    <span>Enable URL Tracker</span>
+                    <span><localize key="redirectUrls_enableUrlTracker">Enable URL Tracker</localize></span>
                 </button>
 
             </umb-editor-sub-header-section>
@@ -53,11 +53,9 @@
 
         <div class="umb-table-head">
             <div class="umb-table-row">
-                <div class="umb-table-cell"></div>
-                <div class="umb-table-cell">Original Url</div>
-                <div class="umb-table-cell">Redirected To</div>
-                <div class="umb-table-cell">Date Created</div>
-                <div class="umb-table-cell"></div>
+                <div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b4"><localize key="redirectUrls_originalUrl">Original URL</localize></div>
+                <div class="umb-table-cell flx-s0 flx-g0" style="flex-basis: 20px;"></div>
+                <div class="umb-table-cell flx-s1 flx-g1 flx-b6"><localize key="redirectUrls_redirectedTo">Redirected To</localize></div>
             </div>
         </div>
 
@@ -65,25 +63,21 @@
 
             <div class="umb-table-row -solid" ng-repeat="redirectUrl in vm.redirectUrls">
 
-                <div class="umb-table-cell">
-                    <i class="umb-table-body__icon umb-table-body__fileicon icon-shuffle"></i>
-                </div>
 
-                <div class="umb-table-cell">
+                <div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b4">
                     <a class="umb-table-body__link" href="{{redirectUrl.originalUrl}}" target="_blank" title="{{redirectUrl.originalUrl}}">{{redirectUrl.originalUrl}}</a>
                 </div>
 
-                <div class="umb-table-cell">
-                    <a class="umb-table-body__link" href="{{redirectUrl.destinationUrl}}" target="_blank" title="{{redirectUrl.destinationUrl}}">{{redirectUrl.destinationUrl}}</a>
+                <div class="umb-table-cell flx-s0 flx-g0" style="flex-basis: 20px;">
+                    <i class="umb-table-body__icon umb-table-body__fileicon icon-arrow-right" style="font-size: 12px; line-height: 1;"></i>
                 </div>
 
-                <div class="umb-table-cell">
-                    {{redirectUrl.createDateUtc | date:'medium'}}
-                </div>
+                <div class="umb-table-cell flx-s1 flx-g1 flx-b6 items-center">
+                    <div class="flx-s1 flx-g1 flx-b0" style="margin-right: 20px;">
+                        <a class="umb-table-body__link" href="{{redirectUrl.destinationUrl}}" target="_blank" title="{{redirectUrl.destinationUrl}}">{{redirectUrl.destinationUrl}}</a>
+                    </div>
 
-                <div class="umb-table-cell justify-end">
-                    <a href="/umbraco/#/content/content/edit/{{redirectUrl.contentId}}" class="umb-era-button -gray umb-button--s" style="margin-right: 10px;">Edit</a>
-                    <button type="button" class="umb-era-button -gray umb-button--s" ng-click="vm.removeRedirect(redirectUrl)">Remove</button>
+                    <button type="button" class="umb-era-button umb-button--s -red" ng-click="vm.removeRedirect(redirectUrl)"><localize key="redirectUrls_removeButton">Remove</localize></button>
                 </div>
 
             </div>
@@ -95,8 +89,8 @@
     <umb-empty-state
         ng-if="vm.redirectUrls.length === 0 && vm.dashboard.searchTerm.length === 0 && !vm.dashboard.loading"
         position="center">
-        <div>No redirects have been made</div>
-        <small class="faded">When a published page gets renamed a redirect will automatically be made to the new page</small>
+        <div><localize key="redirectUrls_noRedirects">No redirects have been made</localize></div>
+        <small class="faded"><localize key="redirectUrls_noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page</localize></small>
     </umb-empty-state>
 
     <umb-empty-state

src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html

@@ -199,7 +199,7 @@
 
                             <div class="umb-package-details__information-item" ng-if="vm.package.created">
                                 <div class="umb-package-details__information-item-label">Created:</div>
-                                <div class="umb-package-details__information-item-content">{{vm.package.created}}</div>
+                                <div class="umb-package-details__information-item-content">{{vm.package.created | date:'yyyy-MM-dd HH:mm:ss'}}</div>
                             </div>
 
                             <div class="umb-package-details__information-item" ng-if="vm.package.latestVersion">

src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html

@@ -1,7 +1,7 @@
 <ul class="unstyled">
 	<li ng-repeat="preval in model.prevalues">
-	<label class="checkbox">
-		<input type="radio" ng-model="model.value" value="{{preval}}" /> {{preval}}
-	</label>
+	    <label class="checkbox">
+	        <input type="radio" ng-model="model.value" value="{{preval.value || preval}}" /> {{preval.label || preval.value || preval}}
+	    </label>
 	</li>
 </ul>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js

@@ -16,7 +16,7 @@ angular.module("umbraco")
     		};
 
     		$scope.scaleDown = function(section){
-    		   var remove = (section.grid > 1) ? 1 : section.grid;
+    		   var remove = (section.grid > 1) ? 1 : 0;
     		   section.grid = section.grid-remove;
     		};
 
@@ -49,9 +49,12 @@ angular.module("umbraco")
     		    $scope.currentSection = section;
     		};
 
-
-    		$scope.deleteSection = function(index){
-    		    $scope.currentTemplate.sections.splice(index, 1);
+    		$scope.deleteSection = function(section, template) {
+    			if ($scope.currentSection === section) {
+    				$scope.currentSection = undefined;
+    			}
+    			var index = template.sections.indexOf(section)
+    			template.sections.splice(index, 1);
     		};
     		
     		$scope.closeSection = function(){

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html

@@ -35,17 +35,24 @@
       <div ng-if="currentSection" style="padding-bottom: 50px;">
 
           <umb-control-group label="@general_width">
-             <div  class="grid-size-scaler" >
+             <div class="grid-size-scaler">
                   <a href ng-click="scaleDown(currentSection)">
-                      <i class="icon icon-navigation-down"></i>
+                      <i class="icon icon-remove"></i>
                   </a>
                       {{currentSection.grid}}
                   <a href ng-click="scaleUp(currentSection, availableLayoutSpace)">
-                      <i class="icon icon-navigation-up"></i>
+                      <i class="icon icon-add"></i>
                   </a>
              </div>
           </umb-control-group>
 
+		  <umb-control-group hide-label="true">
+			<i class="icon-delete red"></i>
+	  		<a class="btn btn-small btn-link" href="" ng-click="deleteSection(currentSection, currentLayout)">
+			  <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
+			</a>
+	  	</umb-control-group>
+
 
           <umb-control-group hide-label="true">
              <ul class="unstyled">

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js

@@ -14,7 +14,7 @@ function RowConfigController($scope) {
     };
 
     $scope.scaleDown = function(section) {
-        var remove = (section.grid > 1) ? 1 : section.grid;
+        var remove = (section.grid > 1) ? 1 : 0;
         section.grid = section.grid - remove;
     };
 
@@ -58,9 +58,14 @@ function RowConfigController($scope) {
         }
     };
 
-    $scope.deleteArea = function(index) {
-        $scope.currentRow.areas.splice(index, 1);
+    $scope.deleteArea = function (cell, row) {
+    	if ($scope.currentCell === cell) {
+    		$scope.currentCell = undefined;
+    	}
+    	var index = row.areas.indexOf(cell)
+    	row.areas.splice(index, 1);
     };
+
     $scope.closeArea = function() {
         $scope.currentCell = undefined;
     };

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html

@@ -6,9 +6,14 @@
       <p><localize key="grid_addRowConfigurationDetail" /></p>
 
       <div class="alert alert-warn ng-scope" ng-show="nameChanged">
-          Modifying a row configuration name will result in loss of
-          data for any existing content that is based on this configuration.
+          <p>Modifying a row configuration name will result in loss of
+          data for any existing content that is based on this configuration.</p>
+          <p><strong>Modifying only the label will not result in data loss.</strong></p>
       </div>
+       
+       <umb-control-group label="@general_label">
+           <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
+       </umb-control-group>
 
       <umb-control-group label="@general_name">
           <input type="text" ng-model="currentRow.name" />
@@ -39,19 +44,23 @@
       <div ng-if="currentCell" style="padding-bottom: 50px;">
 
           <umb-control-group label="@general_width">
-             <div class="grid-size-scaler" >
-                  <div class="grid-size-scaler">
-                      <a href ng-click="scaleDown(currentCell)">
-                          <i class="icon icon-remove"></i>
-                      </a>
+              <div class="grid-size-scaler">
+                  <a href ng-click="scaleDown(currentCell)">
+                      <i class="icon icon-remove"></i>
+                  </a>
                       {{currentCell.grid}}
-                      <a href ng-click="scaleUp(currentCell, availableRowSpace, true)">
-                          <i class="icon icon-add"></i>
-                      </a>
-                  </div>
-             </div>
+                  <a href ng-click="scaleUp(currentCell, availableRowSpace, true)">
+                      <i class="icon icon-add"></i>
+                  </a>
+              </div>
           </umb-control-group>
 
+	  	  <umb-control-group hide-label="true">
+	  		  <i class="icon-delete red"></i>
+	  		  <a class="btn btn-small btn-link" href="" ng-click="deleteArea(currentCell, currentRow)">
+	  			  <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
+	  		  </a>
+	  	  </umb-control-group>
 
           <umb-control-group hide-label="true">
              <ul class="unstyled">

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js

@@ -343,6 +343,37 @@ angular.module("umbraco")
             }
         };
 
+        var shouldApply = function(item, itemType, gridItem) {
+            if (item.applyTo === undefined || item.applyTo === null || item.applyTo === "") {
+                return true;
+            }
+
+            if (typeof (item.applyTo) === "string") {
+                return item.applyTo === itemType;
+            }
+
+            if (itemType === "row") {
+                if (item.applyTo.row === undefined) {
+                    return false;
+                }
+                if (item.applyTo.row === null || item.applyTo.row === "") {
+                    return true;
+                }
+                var rows = item.applyTo.row.split(',');
+                return _.indexOf(rows, gridItem.name) !== -1;
+            } else if (itemType === "cell") {
+                if (item.applyTo.cell === undefined) {
+                    return false;
+                }
+                if (item.applyTo.cell === null || item.applyTo.cell === "") {
+                    return true;
+                }
+                var cells = item.applyTo.cell.split(',');
+                var cellSize = gridItem.grid.toString();
+                return _.indexOf(cells, cellSize) !== -1;
+            }
+        }
+
         $scope.editGridItemSettings = function (gridItem, itemType) {
 
             placeHolder = "{0}";
@@ -352,8 +383,8 @@ angular.module("umbraco")
                 styles = null;
                 config = angular.copy(gridItem.editor.config.settings);
             } else {
-                styles = _.filter(angular.copy($scope.model.config.items.styles), function (item) { return (item.applyTo === undefined || item.applyTo === itemType); });
-                config = _.filter(angular.copy($scope.model.config.items.config), function (item) { return (item.applyTo === undefined || item.applyTo === itemType); });
+                styles = _.filter(angular.copy($scope.model.config.items.styles), function (item) { return shouldApply(item, itemType, gridItem); });
+                config = _.filter(angular.copy($scope.model.config.items.config), function (item) { return shouldApply(item, itemType, gridItem); });
             }
 
             if(angular.isObject(gridItem.config)){

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

@@ -80,7 +80,7 @@
                             <div class="umb-row-title-bar">
 
                                 <div class=".umb-grid-right">
-                                    <div class="umb-row-title">{{row.name}}</div>
+                                    <div class="umb-row-title">{{row.label || row.name}}</div>
 
                                     <div class="umb-grid-has-config" ng-if="row.hasConfig && !sortMode">
                                             <localize key="grid_settingsApplied" />
@@ -114,7 +114,7 @@
 
                                 <div class="mainTb">
                                     <div class="tb">
-                                        <div class="tr">
+                                        <div>
 
                                             <!-- Areas in row -->
                                             <div class="umb-cell td mainTd"
@@ -282,7 +282,7 @@
                             <div class="preview-overlay">
                             </div>
 
-                            <small>{{layout.name}}</small>
+                            <small>{{layout.label || layout.name}}</small>
 
                         </div> <!-- .templates-preview-rows -->
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js

@@ -48,6 +48,7 @@ angular.module("umbraco")
 
             layouts:[
                 {
+                    label: "Headline",
                     name: "Headline",
                     areas: [
                         {
@@ -57,6 +58,7 @@ angular.module("umbraco")
                     ]
                 },
                 {
+                    label: "Article",
                     name: "Article",
                     areas: [
                         {

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html

@@ -72,7 +72,7 @@
                         </div>
 
                         <div>
-                            {{layout.name}}<br />
+                            {{layout.label || layout.name}}<br />
                             <i class="icon-delete red"></i>
                             <a class="btn btn-small btn-link" href ng-click="deleteLayout($index)">
                                 <localize key="general_delete" />

src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js

@@ -118,7 +118,7 @@ angular.module('umbraco')
             //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
             // they contain different data structures so if we need to query against it we need to be aware of this.
             mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property, entity, thumbnail) {
-                if (property.value.src) {
+                if (property.value && property.value.src) {
 
                     if (thumbnail === true) {
                         return property.value.src + "?width=500&mode=max&animationprocessmode=first";

src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html

@@ -44,7 +44,7 @@
                     center="model.value.focalPoint"
                     on-image-loaded="imageLoaded">
                 </umb-image-gravity>
-                <a href class="btn btn-link btn-crop-delete" ng-show="imageIsLoaded" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></a>
+                <a href class="btn btn-link btn-crop-delete" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></a>
             </div>
 
             <ul class="umb-sortable-thumbnails cropList clearfix">

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js

@@ -36,7 +36,8 @@
          }
 
       function clickItem(item) {
-         $location.path($scope.entityType + '/' +$scope.entityType + '/edit/' +item.id);
+         // if item.id is 2147483647 (int.MaxValue) use item.key
+         $location.path($scope.entityType + '/' +$scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id));
          }
 
       function isSortDirection(col, direction) {

src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html

@@ -4,10 +4,10 @@
 		<li style="width: 120px; height: 100px; overflow: hidden;" ng-repeat="image in images">
 
 			<!-- IMAGE -->
-			<img ng-src="{{image.thumbnail}}" alt="" ng-show="image.thumbnail" />
+			<img ng-src="{{image.thumbnail}}" alt="" ng-show="image.thumbnail" title="{{image.name}}" />
 
 			<!-- SVG -->
-			<img ng-if="image.metaData.umbracoExtension.Value === 'svg'" ng-src="{{image.metaData.umbracoFile.Value}}" alt="" />
+			<img ng-if="image.metaData.umbracoExtension.Value === 'svg'" ng-src="{{image.metaData.umbracoFile.Value}}" alt="" title="{{image.name}}" />
 			<img ng-if="image.extension === 'svg'" ng-src="{{image.file}}" alt="" />
 
 			<!-- FILE -->

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -107,12 +107,12 @@
       <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
       <Name>UmbracoExamine</Name>
     </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -127,20 +127,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\dotless.1.4.1.0\lib\dotless.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=0.1.69.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.69.0\lib\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.70.0\lib\Examine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.4.4.0\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.4.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.4.5.0\lib\net45\ImageProcessor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.6.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.4.6.4.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+    <Reference Include="ImageProcessor.Web, Version=4.6.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.6.6.0\lib\net45\ImageProcessor.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
@@ -603,6 +603,7 @@
     <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco\Logout.aspx" />
     <Content Include="Umbraco\umbraco.aspx" />
+    <Content Include="Umbraco_Client\Application\JQuery\jquery.unobtrusive-ajax.min.js" />
     <Content Include="Umbraco_Client\IconPicker\iconpicker.js" />
     <Compile Include="Umbraco\umbraco.aspx.cs">
       <DependentUpon>umbraco.aspx</DependentUpon>
@@ -746,7 +747,6 @@
     <Content Include="Umbraco\Images\Umbraco\settingView.gif" />
     <Content Include="Umbraco\Settings\Views\EditView.aspx" />
     <Content Include="Umbraco_Client\Application\Extensions.js" />
-    <Content Include="Umbraco_Client\Application\JQuery\jquery.unobtrusive-ajax.min.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.min.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.unobtrusive.min.js" />
     <Content Include="Umbraco_Client\ContextMenu\Css\jquery.contextMenu.css" />
@@ -1560,7 +1560,6 @@
     <Content Include="Umbraco_Client\Installer\Images\ui-icons_ffd27a_256x240.png" />
     <Content Include="Umbraco_Client\Installer\Images\ui-icons_ffffff_256x240.png" />
     <Content Include="Umbraco_Client\Installer\Js\ie-png.js" />
-    <Content Include="Umbraco_Client\Installer\Js\jquery.1.4.4.js" />
     <Content Include="Umbraco_Client\Installer\Js\jquery.main.js" />
     <Content Include="Umbraco_Client\Installer\Js\jquery.ui.selectmenu.js" />
     <Content Include="Umbraco\Config\Lang\ko.xml" />
@@ -2413,9 +2412,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7500</DevelopmentServerPort>
+          <DevelopmentServerPort>7540</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7500</IISUrl>
+          <IISUrl>http://localhost:7540</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -2454,4 +2453,5 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     </ReadLinesFromFile>
     <Exec WorkingDirectory="$(ProjectDir)\..\..\build\" Command="BuildBelle.bat $(VersionNumber)" ConsoleToMSBuild="true" IgnoreExitCode="true" ContinueOnError="WarnAndContinue" />
   </Target>
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>

src/Umbraco.Web.UI/config/Dashboard.Release.config

@@ -104,7 +104,7 @@
   </section>
   <section alias="RedirectUrlManagement">
     <areas>
-      <area>developer</area>
+      <area>content</area>
     </areas>
     <tab caption="Redirect URL Management">
       <control>

src/Umbraco.Web.UI/config/Dashboard.config

@@ -111,7 +111,7 @@
   </section>
   <section alias="RedirectUrlManagement">
     <areas>
-      <area>developer</area>
+      <area>content</area>
     </areas>
     <tab caption="Redirect URL Management">
       <control>

src/Umbraco.Web.UI/config/UrlRewriting.Release.config

@@ -2,32 +2,9 @@
 <urlrewritingnet xmlns="http://www.urlrewriting.net/schemas/config/2006/07">
   <rewrites>
     <!-- 
-				Urlrewriting.Net is a cool tool, what can make your urls look nice.
-				The rewriting is controlled with regular expressions. To get more help
-				look at http://www.urlrewriting.net/. 
-				
-				Remember to read the manual! 
-				http://our.umbraco.org/wiki/recommendations/recommended-reading-for-web-developers
-
-				The sample below rewrites a url from 
-				"/product/someproductid.aspx" to 
-				"/product.aspx?productid=someproductid" 
-				
-				The user will not see the rewritten path! The page that will be 
-				loaded from umbraco will instead be:
-				"/product.aspx?productid=someproductid" 
-										
-				<add name="produktidrewrite" 
-					virtualUrl="^~/product/(.*).aspx" 
-					rewriteUrlParameter="ExcludeFromClientQueryString" 
-					destinationUrl="~/product.aspx?productid=$1" 
-					ignoreCase="true" />
-					
-				This sample is usefull for a productpage, where the product comes from a 
-				dynamic datasource, e.g. a database. The querystring "productid" can be loaded
-				from the template, into a macro, that then loads the product!
-				
-				Any bugs or problems with the rewriter, contact Anders/Duckie
-			-->
+		URLRewriting.net is obsolete and will be removed from Umbraco in the future.
+		If you want to do rewrites, make sure to use IIS URL rewrite: https://www.iis.net/downloads/microsoft/url-rewrite
+		The advantage of using IIS rewrite is that it is much faster, much less CPU intensive and much less memory intensive.
+	-->
   </rewrites>
 </urlrewritingnet>

src/Umbraco.Web.UI/config/UrlRewriting.config

@@ -2,32 +2,9 @@
 <urlrewritingnet xmlns="http://www.urlrewriting.net/schemas/config/2006/07">
   <rewrites>
     <!-- 
-				Urlrewriting.Net is a cool tool, what can make your urls look nice.
-				The rewriting is controlled with regular expressions. To get more help
-				look at http://www.urlrewriting.net/. 
-				
-				Remember to read the manual! 
-				http://our.umbraco.org/wiki/recommendations/recommended-reading-for-web-developers
-
-				The sample below rewrites a url from 
-				"/product/someproductid.aspx" to 
-				"/product.aspx?productid=someproductid" 
-				
-				The user will not see the rewritten path! The page that will be 
-				loaded from umbraco will instead be:
-				"/product.aspx?productid=someproductid" 
-										
-				<add name="produktidrewrite" 
-					virtualUrl="^~/product/(.*).aspx" 
-					rewriteUrlParameter="ExcludeFromClientQueryString" 
-					destinationUrl="~/product.aspx?productid=$1" 
-					ignoreCase="true" />
-					
-				This sample is usefull for a productpage, where the product comes from a 
-				dynamic datasource, e.g. a database. The querystring "productid" can be loaded
-				from the template, into a macro, that then loads the product!
-				
-				Any bugs or problems with the rewriter, contact Anders/Duckie
-			-->
+		URLRewriting.net is obsolete and will be removed from Umbraco in the future.
+		If you want to do rewrites, make sure to use IIS URL rewrite: https://www.iis.net/downloads/microsoft/url-rewrite
+		The advantage of using IIS rewrite is that it is much faster, much less CPU intensive and much less memory intensive.
+	-->
   </rewrites>
-</urlrewritingnet>
+</urlrewritingnet>

src/Umbraco.Web.UI/config/grid.editors.config.js

@@ -39,7 +39,7 @@
 	    "view": "textstring",
 	    "icon": "icon-quote",
 	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
+	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
 	        "markup": "<blockquote>#value#</blockquote>"
 	    }
 	}

src/Umbraco.Web.UI/config/splashes/noNodes.aspx

@@ -27,7 +27,7 @@
 			<div class="logo"></div>
 
 			<h1>Welcome to your Umbraco installation</h1>
-			<h3>You're seeing the wonderful page because your website doesn't contain any published content yet.</h3>
+			<h3>You're seeing this wonderful page because your website doesn't contain any published content yet.</h3>
 
 			<div class="cta">
 				<a href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>" class="button">Open Umbraco</a>
@@ -44,7 +44,7 @@
 
 				<div class="col">
 					<h2>Be a part of the community</h2>
-					<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we’re sure that you can get your answers from the community.</p>
+					<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we’re sure that you can get your answers from the community.</p>
 					
 					<a href="http://our.umbraco.org?ref=ourFromInstaller" target="_blank">our.Umbraco &rarr;</a>
 				</div>
@@ -58,4 +58,4 @@
 <script src="https://code.jquery.com/jquery-latest.min.js"></script>
 
 </body>
-</html>
+</html>

src/Umbraco.Web.UI/config/umbracoSettings.config

@@ -1,319 +1,319 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<settings>
-  <content>
-    <imaging>
-      <!-- what file extension that should cause umbraco to create thumbnails -->
-      <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
-      <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
-      <!-- automatically updates dimension, filesize and extension attributes on upload -->
-      <autoFillImageProperties>
-        <uploadField alias="umbracoFile">
-          <widthFieldAlias>umbracoWidth</widthFieldAlias>
-          <heightFieldAlias>umbracoHeight</heightFieldAlias> 
-          <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
-          <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
-        </uploadField>
-      </autoFillImageProperties>
-      
-    </imaging>
-    <scripteditor>
-      <!-- Path to script folder - no ending "/" -->
-      <scriptFolderPath>/scripts</scriptFolderPath>
-      <!-- what files can be opened/created in the script editor -->
-      <scriptFileTypes>js,xml</scriptFileTypes>
-      <!-- disable the codemirror editor and use a simple textarea instead -->
-      <scriptDisableEditor>false</scriptDisableEditor>
-    </scripteditor>
-
-    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
-    <UploadAllowDirectories>True</UploadAllowDirectories>
-    <errors>
-      <!-- the id of the page that should be shown if the page is not found -->
-      <!--<error404>
-                   <errorPage culture="default">1</errorPage>
-                   <errorPage culture="en-US">200</errorPage>
-            </error404>-->
-      <error404>
-        <errorPage culture="default">1</errorPage>
-        <errorPage culture="fr-FR">1079</errorPage>
-        <errorPage culture="en-US">1080</errorPage>
-      </error404>
-    </errors>
-    <notifications>
-      <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <email>your@email.here</email>
-    </notifications>
-
-    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
-    <ensureUniqueNaming>True</ensureUniqueNaming>
-
-    <!-- clean editor content with use of tidy -->
-    <TidyEditorContent>False</TidyEditorContent>
-
-    <!-- the encoding type for tidy. Default is UTF8, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
-    <TidyCharEncoding>UTF8</TidyCharEncoding>
-
-    <!-- to enable new content schema, this needs to be false -->
-    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
-
-    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
-    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
-    <ForceSafeAliases>true</ForceSafeAliases>
-
-    <!-- Enable / disable xml content cache -->
-    <XmlCacheEnabled>True</XmlCacheEnabled>
-
-    <!-- Update disk cache every time content has changed -->
-    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
-
-    <!-- Update in-memory cache if xml file is changed -->
-    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
-
-    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
-    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
-
-    <!-- Show property descriptions in editing view "icon|text|none" -->
-    <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
-    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-    <PreviewBadge>
-      <![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>
-    ]]></PreviewBadge>
-
-    <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
-    <!-- In seconds. 0 will disable cache -->
-    <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
-
-    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
-    <!-- Setting this to true can increase render time for pages with a large number of links -->
-    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
-    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
-
-    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
-         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
-         - silent - Silently suppress the error and do not render the offending macro.
-         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
-                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
-         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>throw</MacroErrors>
-    
-    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess</disallowedUploadFiles>
-
-    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
-    
-  </content>
-
-  <security>
-    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>true</keepUserLoggedIn>
-
-    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
-    
-    <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
-    <allowPasswordReset>true</allowPasswordReset>  
-    
-  </security>
-
-  <requestHandler>
-    <!-- this will ensure that urls are unique when running with multiple root nodes -->
-    <useDomainPrefixes>false</useDomainPrefixes>
-    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>
-    <urlReplacing removeDoubleDashes="true">
-      <char org=" ">-</char>
-      <char org="&quot;"></char>
-      <char org="'"></char>
-      <char org="%"></char>
-      <char org="."></char>
-      <char org=";"></char>
-      <char org="/"></char>
-      <char org="\"></char>
-      <char org=":"></char>
-      <char org="#"></char>
-      <char org="+">plus</char>
-      <char org="*">star</char>
-      <char org="&amp;"></char>
-      <char org="?"></char>
-      <char org="æ">ae</char>
-      <char org="ø">oe</char>
-      <char org="Ã¥">aa</char>
-      <char org="ä">ae</char>
-      <char org="ö">oe</char>
-      <char org="ü">ue</char>
-      <char org="ß">ss</char>
-      <char org="Ä">ae</char>
-      <char org="Ö">oe</char>
-      <char org="|">-</char>
-      <char org="&lt;"></char>
-      <char org="&gt;"></char>
-    </urlReplacing>
-  </requestHandler>
-
-  <templates>
-    <!-- If you want to switch to Mvc then do NOT change useAspNetMasterPages to false -->
-    <!-- This (old!) setting is still used to control how macros are inserted into your pages -->
-    <useAspNetMasterPages>true</useAspNetMasterPages>
-
-    <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
-    <!-- Do not set useAspNetMasterPages to false, it is not relevant to MVC usage -->
-    <defaultRenderingEngine>Mvc</defaultRenderingEngine>
-  </templates>
-
-
-  <!-- this is used by Umbraco to determine if there's valid classes in the /App_Code folder to be used for Rest/XSLT extensions -->
-  <developer>
-    <appCodeFileExtensions>
-      <ext>cs</ext>
-      <ext>vb</ext>
-    </appCodeFileExtensions>
-  </developer>
-
-  <scripting>
-    <razor>
-      <!-- razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml -->
-      <notDynamicXmlDocumentElements>
-        <element>p</element>
-        <element>div</element>
-        <element>ul</element>
-        <element>span</element>
-      </notDynamicXmlDocumentElements>
-      <dataTypeModelStaticMappings>
-        <!--
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            -->
-      </dataTypeModelStaticMappings>
-    </razor>
-  </scripting>
-
-  <!-- This moves the asp.net viewstate data to the end of the html document instead of having it in the beginning-->
-  <viewstateMoverModule enable="false" />
-
-  <!-- 
-		Now that we have Log4Net logging enabled, this section is only used for what gets logged to the umbracoLog table
-		which currently logs items used in the audit trail and roll back scenarios.
-		-->
-  <logging>
-    <enableLogging>true</enableLogging>
-    <enableAsyncLogging>true</enableAsyncLogging>
-    <disabledLogTypes>
-      <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
-    </disabledLogTypes>
-    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
-    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
-    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
-  </logging>
-
-  <scheduledTasks>
-    <!-- add tasks that should be called with an interval (seconds) -->
-    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
-  </scheduledTasks>
-
-  <!-- distributed calls must be enabled when using Umbraco in a load balanced environment -->
-  <distributedCall enable="false">
-    <!-- the id of the user who's making the calls -->
-    <!-- needed for security, umbraco will automatically look up correct login and passwords -->
-    <user>0</user>
-
-    <!--
-    When distributed call is enabled, you need to add all of the servers part taking in load balancing
-    to the server list below. 
-    -->
-
-    <servers>
-
-      <!-- 
-      Add ip number or hostname, make sure that it can be reached from all servers
-      you can also add optional attributes to force a protocol or port number.
-      
-      Examples:
-      
-      <server>127.0.0.1</server>
-      <server forceProtocol="http|https" forcePortnumber="80|443">127.0.0.1</server>
-      
-      Generally when setting up load balancing you will designate a 'master' server, 
-      Umbraco will always assume that the FIRST server listed in this list is the 'master'.
-      (NOTE: Not all load balancing scenarios have a 'master', depends on how you are setting it up)
-      
-      In order for scheduled tasks (including scheduled publishing) to work properly when load balancing, each 
-      server in the load balanced environment needs to know if it is the 'master'. In order for servers
-      to know this or not, they need to compare some values against the servers listed. These values
-      are either: serverName or appId. You should not enter both values but appId will always supersede serverName.
-      The serverName is the easiest and will work so long as you are not load balancing your site on the same server.
-      If you are doing this, then you will need to use appId which is equivalent to the value returned from
-      HttpRuntime.AppDomainAppId. It is recommended that you set either the serverName or appId for all servers 
-      registered here if possible, not just the first one.
-      
-      Examples:
-      
-      <server serverName="MyServer">server1.mysite.com</server>      
-      <server appId="/LM/W3SVC/69/ROOT">server1.mysite.com</server>      
-      -->
-     
-      
-    </servers>
-  </distributedCall>
-
-  <!-- Configuration for repositories -->
-  <!-- Add or remove repositories here. You will need the repository's unique key to be able to connect to it.-->
-  <repositories>
-    <repository name="Umbraco package Repository" guid="65194810-1f85-11dd-bd0b-0800200c9a66" />
-  </repositories>
-
-  <providers>
-    <users>
-      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
-      <!-- specify it here (remember to add it to the web.config as well) -->
-      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
-    </users>
-  </providers>
-
-  <!-- Maps language, usertype, application and application_url to help pages -->
-  <help defaultUrl="http://our.umbraco.org/wiki/umbraco-help/{0}/{1}">
-    <!-- Add links that should open custom help pages -->
-    <!--<link application="content" applicationUrl="dashboard.aspx"  language="en" userType="Administrators" helpUrl="http://www.xyz.no?{0}/{1}/{2}/{3}" /> -->
-  </help>
-
-  <!-- 
-    web.routing
-      @trySkipIisCustomErrors
-        Tries to skip IIS custom errors.
-        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
-        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
-        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
-        over, and _prevent_ Umbraco 404 pages to show.
-      @internalRedirectPreservesTemplate
-        By default as soon as we're not displaying the initial document, we reset the template set by the
-        finder or by the alt. template. Set this option to true to preserve the template set by the finder
-        or by the alt. template, in case of an internal redirect.
-        (false by default, and in fact should remain false unless you know what you're doing)
-      @disableAlternativeTemplates
-        By default you can add a altTemplate querystring or append a template name to the current URL which
-        will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the 
-        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior        
-      @disableFindContentByIdPath
-        By default you can call any content Id in the url and show the content with that id, for example:
-        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting 
-        this setting to true stops that behavior
-      @umbracoApplicationUrl
-        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
-        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
-        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
-  -->
+<?xml version="1.0" encoding="utf-8" ?>
+<settings>
+  <content>
+    <imaging>
+      <!-- what file extension that should cause umbraco to create thumbnails -->
+      <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
+      <!-- what attributes that are allowed in the editor on an img tag -->
+      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
+      <!-- automatically updates dimension, filesize and extension attributes on upload -->
+      <autoFillImageProperties>
+        <uploadField alias="umbracoFile">
+          <widthFieldAlias>umbracoWidth</widthFieldAlias>
+          <heightFieldAlias>umbracoHeight</heightFieldAlias> 
+          <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
+          <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
+        </uploadField>
+      </autoFillImageProperties>
+      
+    </imaging>
+    <scripteditor>
+      <!-- Path to script folder - no ending "/" -->
+      <scriptFolderPath>/scripts</scriptFolderPath>
+      <!-- what files can be opened/created in the script editor -->
+      <scriptFileTypes>js,xml</scriptFileTypes>
+      <!-- disable the codemirror editor and use a simple textarea instead -->
+      <scriptDisableEditor>false</scriptDisableEditor>
+    </scripteditor>
+
+    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
+		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
+    <UploadAllowDirectories>True</UploadAllowDirectories>
+    <errors>
+      <!-- the id of the page that should be shown if the page is not found -->
+      <!--<error404>
+                   <errorPage culture="default">1</errorPage>
+                   <errorPage culture="en-US">200</errorPage>
+            </error404>-->
+      <error404>
+        <errorPage culture="default">1</errorPage>
+        <errorPage culture="fr-FR">1079</errorPage>
+        <errorPage culture="en-US">1080</errorPage>
+      </error404>
+    </errors>
+    <notifications>
+      <!-- the email that should be used as from mail when umbraco sends a notification -->
+      <email>your@email.here</email>
+    </notifications>
+
+    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
+    <ensureUniqueNaming>True</ensureUniqueNaming>
+
+    <!-- clean editor content with use of tidy -->
+    <TidyEditorContent>False</TidyEditorContent>
+
+    <!-- the encoding type for tidy. Default is UTF8, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
+    <TidyCharEncoding>UTF8</TidyCharEncoding>
+
+    <!-- to enable new content schema, this needs to be false -->
+    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
+
+    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
+    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
+    <ForceSafeAliases>true</ForceSafeAliases>
+
+    <!-- Enable / disable xml content cache -->
+    <XmlCacheEnabled>True</XmlCacheEnabled>
+
+    <!-- Update disk cache every time content has changed -->
+    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
+
+    <!-- Update in-memory cache if xml file is changed -->
+    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
+
+    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
+    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
+
+    <!-- Show property descriptions in editing view "icon|text|none" -->
+    <PropertyContextHelpOption>text</PropertyContextHelpOption>
+
+    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
+    <PreviewBadge>
+      <![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>
+    ]]></PreviewBadge>
+
+    <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
+    <!-- In seconds. 0 will disable cache -->
+    <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
+
+    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
+    <!-- Setting this to true can increase render time for pages with a large number of links -->
+    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
+    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
+
+    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
+         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
+         - silent - Silently suppress the error and do not render the offending macro.
+         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
+                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
+         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
+    <MacroErrors>throw</MacroErrors>
+    
+    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess</disallowedUploadFiles>
+
+    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
+    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
+    
+  </content>
+
+  <security>
+    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
+    <keepUserLoggedIn>true</keepUserLoggedIn>
+
+    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
+    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
+    
+    <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
+    <allowPasswordReset>true</allowPasswordReset>  
+    
+  </security>
+
+  <requestHandler>
+    <!-- this will ensure that urls are unique when running with multiple root nodes -->
+    <useDomainPrefixes>false</useDomainPrefixes>
+    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
+    <addTrailingSlash>true</addTrailingSlash>
+    <urlReplacing removeDoubleDashes="true">
+      <char org=" ">-</char>
+      <char org="&quot;"></char>
+      <char org="'"></char>
+      <char org="%"></char>
+      <char org="."></char>
+      <char org=";"></char>
+      <char org="/"></char>
+      <char org="\"></char>
+      <char org=":"></char>
+      <char org="#"></char>
+      <char org="+">plus</char>
+      <char org="*">star</char>
+      <char org="&amp;"></char>
+      <char org="?"></char>
+      <char org="æ">ae</char>
+      <char org="ø">oe</char>
+      <char org="Ã¥">aa</char>
+      <char org="ä">ae</char>
+      <char org="ö">oe</char>
+      <char org="ü">ue</char>
+      <char org="ß">ss</char>
+      <char org="Ä">ae</char>
+      <char org="Ö">oe</char>
+      <char org="|">-</char>
+      <char org="&lt;"></char>
+      <char org="&gt;"></char>
+    </urlReplacing>
+  </requestHandler>
+
+  <templates>
+    <!-- If you want to switch to Mvc then do NOT change useAspNetMasterPages to false -->
+    <!-- This (old!) setting is still used to control how macros are inserted into your pages -->
+    <useAspNetMasterPages>true</useAspNetMasterPages>
+
+    <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
+    <!-- Do not set useAspNetMasterPages to false, it is not relevant to MVC usage -->
+    <defaultRenderingEngine>Mvc</defaultRenderingEngine>
+  </templates>
+
+
+  <!-- this is used by Umbraco to determine if there's valid classes in the /App_Code folder to be used for Rest/XSLT extensions -->
+  <developer>
+    <appCodeFileExtensions>
+      <ext>cs</ext>
+      <ext>vb</ext>
+    </appCodeFileExtensions>
+  </developer>
+
+  <scripting>
+    <razor>
+      <!-- razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml -->
+      <notDynamicXmlDocumentElements>
+        <element>p</element>
+        <element>div</element>
+        <element>ul</element>
+        <element>span</element>
+      </notDynamicXmlDocumentElements>
+      <dataTypeModelStaticMappings>
+        <!--
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            -->
+      </dataTypeModelStaticMappings>
+    </razor>
+  </scripting>
+
+  <!-- This moves the asp.net viewstate data to the end of the html document instead of having it in the beginning-->
+  <viewstateMoverModule enable="false" />
+
+  <!-- 
+		Now that we have Log4Net logging enabled, this section is only used for what gets logged to the umbracoLog table
+		which currently logs items used in the audit trail and roll back scenarios.
+		-->
+  <logging>
+    <enableLogging>true</enableLogging>
+    <enableAsyncLogging>true</enableAsyncLogging>
+    <disabledLogTypes>
+      <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
+    </disabledLogTypes>
+    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
+    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
+    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
+  </logging>
+
+  <scheduledTasks>
+    <!-- add tasks that should be called with an interval (seconds) -->
+    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
+  </scheduledTasks>
+
+  <!-- distributed calls must be enabled when using Umbraco in a load balanced environment -->
+  <distributedCall enable="false">
+    <!-- the id of the user who's making the calls -->
+    <!-- needed for security, umbraco will automatically look up correct login and passwords -->
+    <user>0</user>
+
+    <!--
+    When distributed call is enabled, you need to add all of the servers part taking in load balancing
+    to the server list below. 
+    -->
+
+    <servers>
+
+      <!-- 
+      Add ip number or hostname, make sure that it can be reached from all servers
+      you can also add optional attributes to force a protocol or port number.
+      
+      Examples:
+      
+      <server>127.0.0.1</server>
+      <server forceProtocol="http|https" forcePortnumber="80|443">127.0.0.1</server>
+      
+      Generally when setting up load balancing you will designate a 'master' server, 
+      Umbraco will always assume that the FIRST server listed in this list is the 'master'.
+      (NOTE: Not all load balancing scenarios have a 'master', depends on how you are setting it up)
+      
+      In order for scheduled tasks (including scheduled publishing) to work properly when load balancing, each 
+      server in the load balanced environment needs to know if it is the 'master'. In order for servers
+      to know this or not, they need to compare some values against the servers listed. These values
+      are either: serverName or appId. You should not enter both values but appId will always supersede serverName.
+      The serverName is the easiest and will work so long as you are not load balancing your site on the same server.
+      If you are doing this, then you will need to use appId which is equivalent to the value returned from
+      HttpRuntime.AppDomainAppId. It is recommended that you set either the serverName or appId for all servers 
+      registered here if possible, not just the first one.
+      
+      Examples:
+      
+      <server serverName="MyServer">server1.mysite.com</server>      
+      <server appId="/LM/W3SVC/69/ROOT">server1.mysite.com</server>      
+      -->
+     
+      
+    </servers>
+  </distributedCall>
+
+  <!-- Configuration for repositories -->
+  <!-- Add or remove repositories here. You will need the repository's unique key to be able to connect to it.-->
+  <repositories>
+    <repository name="Umbraco package Repository" guid="65194810-1f85-11dd-bd0b-0800200c9a66" />
+  </repositories>
+
+  <providers>
+    <users>
+      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
+      <!-- specify it here (remember to add it to the web.config as well) -->
+      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
+    </users>
+  </providers>
+
+  <!-- Maps language, usertype, application and application_url to help pages -->
+  <help defaultUrl="http://our.umbraco.org/wiki/umbraco-help/{0}/{1}">
+    <!-- Add links that should open custom help pages -->
+    <!--<link application="content" applicationUrl="dashboard.aspx"  language="en" userType="Administrators" helpUrl="http://www.xyz.no?{0}/{1}/{2}/{3}" /> -->
+  </help>
+
+  <!-- 
+    web.routing
+      @trySkipIisCustomErrors
+        Tries to skip IIS custom errors.
+        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
+        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
+        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
+        over, and _prevent_ Umbraco 404 pages to show.
+      @internalRedirectPreservesTemplate
+        By default as soon as we're not displaying the initial document, we reset the template set by the
+        finder or by the alt. template. Set this option to true to preserve the template set by the finder
+        or by the alt. template, in case of an internal redirect.
+        (false by default, and in fact should remain false unless you know what you're doing)
+      @disableAlternativeTemplates
+        By default you can add a altTemplate querystring or append a template name to the current URL which
+        will make Umbraco render the content on the current page with the template you requested, for example:
+        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the 
+        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior        
+      @disableFindContentByIdPath
+        By default you can call any content Id in the url and show the content with that id, for example:
+        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting 
+        this setting to true stops that behavior
+      @umbracoApplicationUrl
+        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
+        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
+        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
+  -->
   <web.routing
     trySkipIisCustomErrors="false"
     internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"
     umbracoApplicationUrl="">
-  </web.routing>
-
+  </web.routing>
+
 </settings>

src/Umbraco.Web.UI/packages.config

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.1" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
   <package id="dotless" version="1.4.1.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.69.0" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.4.4.0" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="4.6.4.0" targetFramework="net45" />
+  <package id="Examine" version="0.1.70.0" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.4.5.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="4.6.6.0" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -147,9 +147,9 @@
     <key alias="nodeName">Page Title</key>
     <key alias="otherElements">Properties</key>
     <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
-    <key alias="parentNotPublishedAnomaly">Oops: this document is published but is not in the cache (internal error - see log)</key>
-    <key alias="getUrlException">Oops: could not get the url (internal error - see log)</key>
-    <key alias="routeError">Oops: this document is published but its url would collide with content %0%</key>
+    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
+    <key alias="getUrlException">Could not get the url</key>
+    <key alias="routeError">This document is published but its url would collide with content %0%</key>
     <key alias="publish">Publish</key>
     <key alias="publishStatus">Publication Status</key>
     <key alias="releaseDate">Publish at</key>
@@ -1356,6 +1356,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 	  <key alias="xmlDataIntegrityCheckMedia">Media - Total XML: %0%, Total: %1%, Total invalid %2%</key>
 	  <key alias="xmlDataIntegrityCheckContent">Content - Total XML: %0%, Total published: %1%, Total invalid %2%</key>
 
+	  <key alias="httpsCheckValidCertificate">Your site certificate was marked as valid.</key>
 	  <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
 	  <key alias="httpsCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
 	  <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
@@ -1395,11 +1396,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
     <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
 
-    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMed by another was found.]]></key>
-    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMed by another was not found.]]></key>
+    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was found.]]></key>
+    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was not found.]]></key>
     <key alias="clickJackingSetHeaderInConfig">Set Header in Config</key>
-    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMed by other websites.</key>
-    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMing of the site by other websites has been added to your web.config file.</key>
+    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.</key>
+    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.</key>
     <key alias="clickJackingSetHeaderInConfigError">Could not update web.config file. Error: %0%</key>
 
     <!-- The following key get these tokens passed in:
@@ -1416,4 +1417,21 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
   </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Disable URL tracker</key>
+    <key alias="enableUrlTracker">Enable URL tracker</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Redirected To</key>
+    <key alias="noRedirects">No redirects have been made</key>
+    <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
+    <key alias="removeButton">Remove</key>
+    <key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
+    <key alias="redirectRemoved">Redirect URL removed.</key>
+    <key alias="redirectRemoveError">Error removing redirect URL.</key>
+    <key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
+    <key alias="disabledConfirm">URL tracker has now been disabled.</key>
+    <key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
+    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
+    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
+  </area>
 </language>

src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml

@@ -148,9 +148,9 @@
     <key alias="nodeName">Page Title</key>
     <key alias="otherElements">Properties</key>
     <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
-    <key alias="parentNotPublishedAnomaly">Oops: this document is published but is not in the cache (internal error - see log)</key>
-    <key alias="getUrlException">Oops: could not get the url (internal error - see log)</key>
-    <key alias="routeError">Oops: this document is published but its url would collide with content %0%</key>
+    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
+    <key alias="getUrlException">Could not get the url</key>
+    <key alias="routeError">This document is published but its url would collide with content %0%</key>
     <key alias="publish">Publish</key>
     <key alias="publishStatus">Publication Status</key>
     <key alias="releaseDate">Publish at</key>
@@ -460,6 +460,7 @@
     <key alias="install">Install</key>
     <key alias="invalid">Invalid</key>
     <key alias="justify">Justify</key>
+    <key alias="label">Label</key>
     <key alias="language">Language</key>
     <key alias="layout">Layout</key>
     <key alias="loading">Loading</key>
@@ -1360,6 +1361,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="xmlDataIntegrityCheckMedia">Media - Total XML: %0%, Total: %1%, Total invalid: %2%</key>
     <key alias="xmlDataIntegrityCheckContent">Content - Total XML: %0%, Total published: %1%, Total invalid: %2%</key>
 
+    <key alias="httpsCheckValidCertificate">Your site certificate was marked as valid.</key>
     <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
     <key alias="httpsCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
@@ -1399,11 +1401,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
     <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
 
-    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMed by another was found.]]></key>
-    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMed by another was not found.]]></key>
+    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was found.]]></key>
+    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was not found.]]></key>
     <key alias="clickJackingSetHeaderInConfig">Set Header in Config</key>
-    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMed by other websites.</key>
-    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMing of the site by other websites has been added to your web.config file.</key>
+    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.</key>
+    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.</key>
     <key alias="clickJackingSetHeaderInConfigError">Could not update web.config file. Error: %0%</key>
 
     <!-- The following key get these tokens passed in:
@@ -1420,4 +1422,21 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
   </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Disable URL tracker</key>
+    <key alias="enableUrlTracker">Enable URL tracker</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Redirected To</key>
+    <key alias="noRedirects">No redirects have been made</key>
+    <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
+    <key alias="removeButton">Remove</key>
+    <key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
+    <key alias="redirectRemoved">Redirect URL removed.</key>
+    <key alias="redirectRemoveError">Error removing redirect URL.</key>
+    <key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
+    <key alias="disabledConfirm">URL tracker has now been disabled.</key>
+    <key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
+    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
+    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
+  </area>
 </language>

src/Umbraco.Web.UI/umbraco/config/lang/ru.xml

@@ -499,6 +499,7 @@
     <key alias="install">Установить</key>
     <key alias="invalid">Неверно</key>
     <key alias="justify">Выравнивание</key>
+    <key alias="label">Название</key>
     <key alias="language">Язык</key>
     <key alias="layout">Макет</key>
     <key alias="loading">Загрузка</key>
@@ -654,6 +655,7 @@
     <key alias="xmlDataIntegrityCheckMedia">Медиа - всего в XML: %0%, всего: %1%Б с ошибками: %2%</key>
     <key alias="xmlDataIntegrityCheckContent">Содержимое - всего в XML: %0%, всего опубликовано: %1%, с ошибками: %2%</key>
 
+    <key alias="httpsCheckValidCertificate">Сертификат Вашего сайта отмечен как проверенный.</key>
     <key alias="httpsCheckInvalidCertificate">Ошибка проверки сертификата: '%0%'</key>
     <key alias="httpsCheckInvalidUrl">Ошибка проверки адреса URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">Сейчас Вы %0% просматриваете сайт, используя протокол HTTPS.</key>
@@ -1065,6 +1067,23 @@
 		Чтобы опубликовать ранее неопубликованные документы среди дочерних, отметьте опцию <em>Включая неопубликованные дочерние документы</em>.
 		]]></key>
   </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Остановить отслеживание URL</key>
+    <key alias="enableUrlTracker">Запустить отслеживание URL</key>
+    <key alias="originalUrl">Первоначальный URL</key>
+    <key alias="redirectedTo">Перенаправлен в</key>
+    <key alias="noRedirects">На данный момент нет ни одного перенаправления</key>
+    <key alias="noRedirectsDescription">Если опубликованный документ переименовывается или меняет свое расположение в дереве, а следовательно, меняется адрес (URL), автоматически создается перенаправление на новое местоположение этого документа.</key>
+    <key alias="removeButton">Удалить</key>
+    <key alias="confirmRemove">Вы уверены, что хотите удалить перенаправление с '%0%' на '%1%'?</key>
+    <key alias="redirectRemoved">Перенаправление удалено.</key>
+    <key alias="redirectRemoveError">Ошибка удаления перенаправления.</key>
+    <key alias="confirmDisable">Вы уверены, что хотите остановить отслеживание URL?</key>
+    <key alias="disabledConfirm">Отслеживание URL в настоящий момент остановлено.</key>
+    <key alias="disableError">Ошибка остановки отслеживания URL, более подробные сведения находятся в системном журнале.</key>
+    <key alias="enabledConfirm">Отслеживание URL в настоящий момент запущено.</key>
+    <key alias="enableError">Ошибка запуска отслеживания URL, более подробные сведения находятся в системном журнале.</key>
+  </area>
   <area alias="relatedlinks">
     <key alias="caption">Заголовок</key>
     <key alias="captionPlaceholder">Укажите заголовок</key>

src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx

@@ -108,16 +108,14 @@
         </div>
     </asp:PlaceHolder>
 
-    <asp:PlaceHolder ID="SaveAndCancelPlaceholder" runat="server">
-        <br />
-        <p>
+    <div class="btn-toolbar umb-btn-toolbar">
+        <asp:PlaceHolder ID="SaveAndCancelPlaceholder" runat="server">
+            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
             <asp:PlaceHolder ID="SavePlaceholder" runat="server">        
-                <asp:Button ID="ValidateAndSave" runat="server" OnClick="ValidateAndSave_Click" />
-                <em> <%= umbraco.ui.Text("or") %> </em>
-            </asp:PlaceHolder>        
-            <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", Security.CurrentUser)%></a>  
-        </p>
-    </asp:PlaceHolder>
-  
+                <asp:Button ID="ValidateAndSave" runat="server" CssClass="btn btn-primary" Text="Create" OnClick="ValidateAndSave_Click"></asp:Button>
+            </asp:PlaceHolder>
+        </asp:Placeholder>
+    </div>
+     
 </asp:Content>
   

src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js

@@ -86,7 +86,7 @@
                 onkeyup: false
             });
 
-            $('form input.domain').live('focus', function(event) {
+            $('form input.domain').on('focus', function(event) {
                 if (event.type != 'focusin') return;
                 $(this).nextAll('input').val("");
             });

src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js

@@ -287,11 +287,11 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
             });
 
             // Listen for drag events
-            $(".umbFolderBrowser").live('dragenter dragover', function (e) {
+            $(".umbFolderBrowser").on('dragenter dragover', function (e) {
                 $(".upload-overlay").show();
             });
 
-            $(".upload-overlay").live('dragleave dragexit', function (e) {
+            $(".upload-overlay").on('dragleave dragexit', function (e) {
                 $(this).hide();
             }).click(function () {
                 $(this).hide();
@@ -389,12 +389,12 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                             processData: false,
                             success: function (data, textStatus) {
                                 if (textStatus == "error") {
-                                    alert("Oops. Could not update sort order");
+                                    alert("Could not update sort order");
                                     self._getChildNodes();
                                 }
                             },
                             error: function(data) {
-                                alert("Oops. Could not update sort order. Err: " + data.statusText);
+                                alert("Could not update sort order. Err: " + data.statusText);
                                 self._getChildNodes();
                             }
                         });

src/Umbraco.Web.UI/umbraco_client/Installer/js/jquery.1.4.4.js

@@ -1,259 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.4
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Nov 11 19:04:53 2010 -0500
- */
-(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
-h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;k<J.length;k++){h=J[k];h.origType.replace(X,"")===a.type?f.push(h.selector):J.splice(k--,1)}f=c(a.target).closest(f,a.currentTarget);o=0;for(x=f.length;o<x;o++){r=f[o];for(k=0;k<J.length;k++){h=J[k];if(r.selector===h.selector&&(!A||A.test(h.namespace))){l=r.elem;e=null;if(h.preType==="mouseenter"||
-h.preType==="mouseleave"){a.type=h.preType;e=c(a.relatedTarget).closest(h.selector)[0]}if(!e||e!==l)C.push({elem:l,handleObj:h,level:r.level})}}}o=0;for(x=C.length;o<x;o++){f=C[o];if(d&&f.level>d)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
-"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
-e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
-"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
-a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
-s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
-j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
-toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
--1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
-if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K<Q;K++)if((j=arguments[K])!=null)for(s in j){v=G[s];z=j[s];if(G!==z)if(ga&&z&&(b.isPlainObject(z)||(H=b.isArray(z)))){if(H){H=false;v=v&&b.isArray(v)?v:[]}else v=v&&b.isPlainObject(v)?v:{};G[s]=b.extend(ga,v,z)}else if(z!==B)G[s]=z}return G};b.extend({noConflict:function(j){E.$=e;if(j)E.jQuery=d;return b},isReady:false,readyWait:1,ready:function(j){j===true&&b.readyWait--;
-if(!b.readyWait||j!==true&&!b.isReady){if(!t.body)return setTimeout(b.ready,1);b.isReady=true;if(!(j!==true&&--b.readyWait>0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
-b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
-!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
-l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H<G;){if(s.apply(j[H++],v)===false)break}else if(K)for(z in j){if(s.call(j[z],
-z,j[z])===false)break}else for(v=j[0];H<G&&s.call(v,H,v)!==false;v=j[++H]);return j},trim:O?function(j){return j==null?"":O.call(j)}:function(j){return j==null?"":j.toString().replace(k,"").replace(o,"")},makeArray:function(j,s){var v=s||[];if(j!=null){var z=b.type(j);j.length==null||z==="string"||z==="function"||z==="regexp"||b.isWindow(j)?M.call(v,j):b.merge(v,j)}return v},inArray:function(j,s){if(s.indexOf)return s.indexOf(j);for(var v=0,z=s.length;v<z;v++)if(s[v]===j)return v;return-1},merge:function(j,
-s){var v=j.length,z=0;if(typeof s.length==="number")for(var H=s.length;z<H;z++)j[v++]=s[z];else for(;s[z]!==B;)j[v++]=s[z++];j.length=v;return j},grep:function(j,s,v){var z=[],H;v=!!v;for(var G=0,K=j.length;G<K;G++){H=!!s(j[G],G);v!==H&&z.push(j[G])}return z},map:function(j,s,v){for(var z=[],H,G=0,K=j.length;G<K;G++){H=s(j[G],G,v);if(H!=null)z[z.length]=H}return z.concat.apply([],z)},guid:1,proxy:function(j,s,v){if(arguments.length===2)if(typeof s==="string"){v=j;j=v[s];s=B}else if(s&&!b.isFunction(s)){v=
-s;s=B}if(!s&&j)s=function(){return j.apply(v||this,arguments)};if(j)s.guid=j.guid=j.guid||s.guid||b.guid++;return s},access:function(j,s,v,z,H,G){var K=j.length;if(typeof s==="object"){for(var Q in s)b.access(j,Q,s[Q],z,H,v);return j}if(v!==B){z=!G&&z&&b.isFunction(v);for(Q=0;Q<K;Q++)H(j[Q],s,z?v.call(j[Q],Q,H(j[Q],s)):v,G);return j}return K?H(j[0],s):B},now:function(){return(new Date).getTime()},uaMatch:function(j){j=j.toLowerCase();j=L.exec(j)||g.exec(j)||i.exec(j)||j.indexOf("compatible")<0&&n.exec(j)||
-[];return{browser:j[1]||"",version:j[2]||"0"}},browser:{}});b.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(j,s){R["[object "+s+"]"]=s.toLowerCase()});m=b.uaMatch(m);if(m.browser){b.browser[m.browser]=true;b.browser.version=m.version}if(b.browser.webkit)b.browser.safari=true;if(D)b.inArray=function(j,s){return D.call(s,j)};if(!/\s/.test("\u00a0")){k=/^[\s\xA0]+/;o=/[\s\xA0]+$/}f=b(t);if(t.addEventListener)u=function(){t.removeEventListener("DOMContentLoaded",u,
-false);b.ready()};else if(t.attachEvent)u=function(){if(t.readyState==="complete"){t.detachEvent("onreadystatechange",u);b.ready()}};return E.jQuery=E.$=b}();(function(){c.support={};var a=t.documentElement,b=t.createElement("script"),d=t.createElement("div"),e="script"+c.now();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
-k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
-scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
-1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="<div style='width:4px;'></div>";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
-"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
-c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
-else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h<l;h++){f=e[h].name;if(f.indexOf("data-")===0){f=f.substr(5);ka(this[0],f,d[f])}}}return d}else if(typeof a==="object")return this.each(function(){c.data(this,
-a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(b===B){d=this.triggerHandler("getData"+k[1]+"!",[k[0]]);if(d===B&&this.length){d=c.data(this[0],a);d=ka(this[0],a,d)}return d===B&&k[1]?this.data(k[0]):d}else return this.each(function(){var o=c(this),x=[k[0],b];o.triggerHandler("setData"+k[1]+"!",x);c.data(this,a,b);o.triggerHandler("changeData"+k[1]+"!",x)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var e=
-c.data(a,b);if(!d)return e||[];if(!e||c.isArray(d))e=c.data(a,b,c.makeArray(d));else e.push(d);return e}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),e=d.shift();if(e==="inprogress")e=d.shift();if(e){b==="fx"&&d.unshift("inprogress");e.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===B)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,
-a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var sa=/[\n\t]/g,ha=/\s+/,Sa=/\r/g,Ta=/^(?:href|src|style)$/,Ua=/^(?:button|input)$/i,Va=/^(?:button|input|object|select|textarea)$/i,Wa=/^a(?:rea)?$/i,ta=/^(?:radio|checkbox)$/i;c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",
-colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};c.fn.extend({attr:function(a,b){return c.access(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(x){var r=c(this);r.addClass(a.call(this,x,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===
-1)if(f.className){for(var h=" "+f.className+" ",l=f.className,k=0,o=b.length;k<o;k++)if(h.indexOf(" "+b[k]+" ")<0)l+=" "+b[k];f.className=c.trim(l)}else f.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var x=c(this);x.removeClass(a.call(this,o,x.attr("class")))});if(a&&typeof a==="string"||a===B)for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===1&&f.className)if(a){for(var h=(" "+f.className+" ").replace(sa," "),
-l=0,k=b.length;l<k;l++)h=h.replace(" "+b[l]+" "," ");f.className=c.trim(h)}else f.className=""}return this},toggleClass:function(a,b){var d=typeof a,e=typeof b==="boolean";if(c.isFunction(a))return this.each(function(f){var h=c(this);h.toggleClass(a.call(this,f,h.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var f,h=0,l=c(this),k=b,o=a.split(ha);f=o[h++];){k=e?k:!l.hasClass(f);l[k?"addClass":"removeClass"](f)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,
-"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(sa," ").indexOf(a)>-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
-if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h<e;h++){var l=f[h];if(l.selected&&(c.support.optDisabled?!l.disabled:l.getAttribute("disabled")===null)&&(!l.parentNode.disabled||!c.nodeName(l.parentNode,"optgroup"))){a=c(l).val();if(b)return a;d.push(a)}}return d}if(ta.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Sa,"")}return B}var k=c.isFunction(a);return this.each(function(o){var x=c(this),r=a;if(this.nodeType===1){if(k)r=
-a.call(this,o,x.val());if(r==null)r="";else if(typeof r==="number")r+="";else if(c.isArray(r))r=c.map(r,function(C){return C==null?"":C+""});if(c.isArray(r)&&ta.test(this.type))this.checked=c.inArray(x.val(),r)>=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
-attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
-b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
-c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
-arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
-d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
-c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h<A.length;h++){C=A[h];if(d.guid===C.guid){if(k||x.test(C.namespace)){e==null&&A.splice(h--,1);r.remove&&r.remove.call(a,C)}if(e!=null)break}}if(A.length===0||e!=null&&A.length===1){if(!r.teardown||r.teardown.call(a,o)===false)c.removeEvent(a,f,w.handle);delete I[f]}}else for(h=0;h<A.length;h++){C=A[h];if(k||x.test(C.namespace)){c.event.remove(a,r,C.handler,h);A.splice(h--,1)}}}if(c.isEmptyObject(I)){if(b=
-w.handle)b.elem=null;delete w.events;delete w.handle;if(typeof w==="function")c.removeData(a,J);else c.isEmptyObject(w)&&c.removeData(a)}}}}},trigger:function(a,b,d,e){var f=a.type||a;if(!e){a=typeof a==="object"?a[c.expando]?a:c.extend(c.Event(f),a):c.Event(f);if(f.indexOf("!")>=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
-8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
-"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
-d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f<l;f++){var k=d[f];if(b||e.test(k.namespace)){a.handler=k.handler;a.data=k.data;a.handleObj=k;k=k.handler.apply(this,h);if(k!==B){a.result=k;if(k===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[c.expando])return a;var b=a;a=c.Event(b);for(var d=this.props.length,e;d;){e=this.props[--d];a[e]=b[e]}if(!a.target)a.target=a.srcElement||t;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=t.documentElement;d=t.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(a.which==null&&(a.charCode!=null||a.keyCode!=null))a.which=a.charCode!=null?a.charCode:a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==B)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,Y(a.origType,a.selector),c.extend({},a,{handler:Ka,guid:a.handler.guid}))},remove:function(a){c.event.remove(this,
-Y(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,d){if(c.isWindow(this))this.onbeforeunload=d},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.removeEvent=t.removeEventListener?function(a,b,d){a.removeEventListener&&a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent&&a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=
-c.now();this[c.expando]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=ca;var a=this.originalEvent;if(a)if(a.preventDefault)a.preventDefault();else a.returnValue=false},stopPropagation:function(){this.isPropagationStopped=ca;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=ca;this.stopPropagation()},isDefaultPrevented:U,isPropagationStopped:U,isImmediatePropagationStopped:U};
-var va=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},wa=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?wa:va,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?wa:va)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(){if(this.nodeName.toLowerCase()!==
-"form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length){a.liveFired=B;return la("submit",this,arguments)}});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13){a.liveFired=B;return la("submit",this,arguments)}})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};if(!c.support.changeBubbles){var V,
-xa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
-B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
-"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
-0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h<k;h++)c.event.add(this[h],d,l,e)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&!a.preventDefault)for(var d in a)this.unbind(d,
-a[d]);else{d=0;for(var e=this.length;d<e;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,e){return this.live(b,d,e,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var d=c.Event(a);d.preventDefault();d.stopPropagation();c.event.trigger(d,b,this[0]);return d.result}},toggle:function(a){for(var b=arguments,d=
-1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(e){var f=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,f+1);e.preventDefault();return b[f].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var ya={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,e,f,h){var l,k=0,o,x,r=h||this.selector;h=h?this:c(this.context);if(typeof d===
-"object"&&!d.preventDefault){for(l in d)h[b](l,e,d[l],r);return this}if(c.isFunction(e)){f=e;e=B}for(d=(d||"").split(" ");(l=d[k++])!=null;){o=X.exec(l);x="";if(o){x=o[0];l=l.replace(X,"")}if(l==="hover")d.push("mouseenter"+x,"mouseleave"+x);else{o=l;if(l==="focus"||l==="blur"){d.push(ya[l]+x);l+=x}else l=(ya[l]||l)+x;if(b==="live"){x=0;for(var A=h.length;x<A;x++)c.event.add(h[x],"live."+Y(l,r),{data:e,selector:r,handler:f,origType:l,origHandler:f,preType:o})}else h.unbind("live."+Y(l,r),f)}}return this}});
-c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d,e){if(e==null){e=d;d=null}return arguments.length>0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
-(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1&&!q){y.sizcache=n;y.sizset=p}if(y.nodeName.toLowerCase()===i){F=y;break}y=y[g]}m[p]=F}}}function b(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1){if(!q){y.sizcache=n;y.sizset=p}if(typeof i!=="string"){if(y===i){F=true;break}}else if(k.filter(i,
-[y]).length>0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
-break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
-q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
-l;g.sort(w);if(h)for(var i=1;i<g.length;i++)g[i]===g[i-1]&&g.splice(i--,1)}return g};k.matches=function(g,i){return k(g,null,null,i)};k.matchesSelector=function(g,i){return k(i,null,null,[g]).length>0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p<q;p++){var u,y=o.order[p];if(u=o.leftMatch[y].exec(g)){var F=u[1];u.splice(1,1);if(F.substr(F.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");m=o.find[y](u,i,n);if(m!=null){g=g.replace(o.match[y],"");break}}}}m||(m=i.getElementsByTagName("*"));
-return{set:m,expr:g}};k.filter=function(g,i,n,m){for(var p,q,u=g,y=[],F=i,M=i&&i[0]&&k.isXML(i[0]);g&&i.length;){for(var N in o.filter)if((p=o.leftMatch[N].exec(g))!=null&&p[2]){var O,D,R=o.filter[N];D=p[1];q=false;p.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(F===y)y=[];if(o.preFilter[N])if(p=o.preFilter[N](p,F,n,y,m,M)){if(p===true)continue}else q=O=true;if(p)for(var j=0;(D=F[j])!=null;j++)if(D){O=R(D,p,j,F);var s=m^!!O;if(n&&O!=null)if(s)q=true;else F[j]=false;else if(s){y.push(D);q=true}}if(O!==
-B){n||(F=y);g=g.replace(o.match[N],"");if(!q)return[];break}}}if(g===u)if(q==null)k.error(g);else break;u=g}return F};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var o=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
-POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,i){var n=typeof i==="string",m=n&&!/\W/.test(i);n=n&&!m;if(m)i=i.toLowerCase();m=0;for(var p=g.length,q;m<p;m++)if(q=g[m]){for(;(q=q.previousSibling)&&q.nodeType!==1;);g[m]=n||q&&q.nodeName.toLowerCase()===
-i?q||false:q===i}n&&k.filter(i,g,true)},">":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p<q;p++){if(n=g[p]){n=n.parentNode;g[p]=n.nodeName.toLowerCase()===i?n:false}}else{for(;p<q;p++)if(n=g[p])g[p]=m?n.parentNode:n.parentNode===i;m&&k.filter(i,g,true)}},"":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=i=i.toLowerCase();q=a}q("parentNode",i,p,g,m,n)},"~":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=
-i=i.toLowerCase();q=a}q("previousSibling",i,p,g,m,n)}},find:{ID:function(g,i,n){if(typeof i.getElementById!=="undefined"&&!n)return(g=i.getElementById(g[1]))&&g.parentNode?[g]:[]},NAME:function(g,i){if(typeof i.getElementsByName!=="undefined"){for(var n=[],m=i.getElementsByName(g[1]),p=0,q=m.length;p<q;p++)m[p].getAttribute("name")===g[1]&&n.push(m[p]);return n.length===0?null:n}},TAG:function(g,i){return i.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,i,n,m,p,q){g=" "+g[1].replace(/\\/g,
-"")+" ";if(q)return g;q=0;for(var u;(u=i[q])!=null;q++)if(u)if(p^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
-m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
-true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
-g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return i<n[3]-0},gt:function(g,i,n){return i>n[3]-0},nth:function(g,i,n){return n[3]-
-0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n<m;n++)if(i[n]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+p)},CHILD:function(g,i){var n=i[1],m=g;switch(n){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(n===
-"first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":n=i[2];var p=i[3];if(n===1&&p===0)return true;var q=i[0],u=g.parentNode;if(u&&(u.sizcache!==q||!g.nodeIndex)){var y=0;for(m=u.firstChild;m;m=m.nextSibling)if(m.nodeType===1)m.nodeIndex=++y;u.sizcache=q}m=g.nodeIndex-p;return n===0?m===0:m%n===0&&m/n>=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
-i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
-if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
-g);else if(typeof g.length==="number")for(var p=g.length;n<p;n++)m.push(g[n]);else for(;g[n];n++)m.push(g[n]);return m}}var w,I;if(t.documentElement.compareDocumentPosition)w=function(g,i){if(g===i){h=true;return 0}if(!g.compareDocumentPosition||!i.compareDocumentPosition)return g.compareDocumentPosition?-1:1;return g.compareDocumentPosition(i)&4?-1:1};else{w=function(g,i){var n,m,p=[],q=[];n=g.parentNode;m=i.parentNode;var u=n;if(g===i){h=true;return 0}else if(n===m)return I(g,i);else if(n){if(!m)return 1}else return-1;
-for(;u;){p.unshift(u);u=u.parentNode}for(u=m;u;){q.unshift(u);u=u.parentNode}n=p.length;m=q.length;for(u=0;u<n&&u<m;u++)if(p[u]!==q[u])return I(p[u],q[u]);return u===n?I(g,q[u],-1):I(p[u],i,1)};I=function(g,i,n){if(g===i)return n;for(g=g.nextSibling;g;){if(g===i)return-1;g=g.nextSibling}return 1}}k.getText=function(g){for(var i="",n,m=0;g[m];m++){n=g[m];if(n.nodeType===3||n.nodeType===4)i+=n.nodeValue;else if(n.nodeType!==8)i+=k.getText(n.childNodes)}return i};(function(){var g=t.createElement("div"),
-i="script"+(new Date).getTime(),n=t.documentElement;g.innerHTML="<a name='"+i+"'/>";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
-n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
-function(){var g=k,i=t.createElement("div");i.innerHTML="<p class='TEST'></p>";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
-p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
-t.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
-function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n<u;n++)k(g,q[n],m);return k.filter(p,m)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=k.getText;c.isXMLDoc=k.isXML;
-c.contains=k.contains})();var Za=/Until$/,$a=/^(?:parents|prevUntil|prevAll)/,ab=/,/,Na=/^.[^:#\[\.,]*$/,bb=Array.prototype.slice,cb=c.expr.match.POS;c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,e=0,f=this.length;e<f;e++){d=b.length;c.find(a,this[e],b);if(e>0)for(var h=d;h<b.length;h++)for(var l=0;l<d;l++)if(b[l]===b[h]){b.splice(h--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,e=b.length;d<e;d++)if(c.contains(this,b[d]))return true})},
-not:function(a){return this.pushStack(ma(this,a,false),"not",a)},filter:function(a){return this.pushStack(ma(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e<f;e++){l=a[e];k[l]||(k[l]=c.expr.match.POS.test(l)?c(l,b||this.context):l)}for(;h&&h.ownerDocument&&h!==b;){for(l in k){e=k[l];if(e.jquery?e.index(h)>-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
-h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e<f;e++)for(h=this[e];h;)if(l?l.index(h)>-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
-c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
-2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
-b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
-e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/<tbody/i,eb=/<|&#?\w+;/,Ca=/<(?:script|object|embed|option|style)/i,Da=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/\=([^="'>\s]+\/)>/g,P={option:[1,
-"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
-else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1></$2>");try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(e){this.empty().append(a)}}else c.isFunction(a)?this.each(function(f){var h=c(this);h.html(a.call(this,f,h.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=
-c(this),e=d.html();d.replaceWith(a.call(this,b,e))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){var e,f,h,l=a[0],k=[];if(!c.support.checkClone&&arguments.length===3&&typeof l==="string"&&Da.test(l))return this.each(function(){c(this).domManip(a,
-b,d,true)});if(c.isFunction(l))return this.each(function(x){var r=c(this);a[0]=l.call(this,x,b?r.html():B);r.domManip(a,b,d)});if(this[0]){e=l&&l.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:c.buildFragment(a,this,k);h=e.fragment;if(f=h.childNodes.length===1?h=h.firstChild:h.firstChild){b=b&&c.nodeName(f,"tr");f=0;for(var o=this.length;f<o;f++)d.call(b?c.nodeName(this[f],"table")?this[f].getElementsByTagName("tbody")[0]||this[f].appendChild(this[f].ownerDocument.createElement("tbody")):
-this[f]:this[f],f>0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
-prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f<h;f++){var l=(f>0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
-b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1></$2>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]==="<table>"&&!x?r.childNodes:[];for(o=k.length-
-1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
-d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
-jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
-zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
-h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
-if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
-d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
-e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
-"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("<div>").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
-!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
-getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
-script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
-!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
-false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
-A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
-b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
-c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
-c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
-encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
-[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
-e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
-if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
-3),a,b,d);else{d=0;for(var e=this.length;d<e;d++){a=this[d];b=a.style.display;if(!c.data(a,"olddisplay")&&b==="none")b=a.style.display="";b===""&&c.css(a,"display")==="none"&&c.data(a,"olddisplay",qa(a.nodeName))}for(d=0;d<e;d++){a=this[d];b=a.style.display;if(b===""||b==="none")a.style.display=c.data(a,"olddisplay")||""}return this}},hide:function(a,b,d){if(a||a===0)return this.animate(S("hide",3),a,b,d);else{a=0;for(b=this.length;a<b;a++){d=c.css(this[a],"display");d!=="none"&&c.data(this[a],"olddisplay",
-d)}for(a=0;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b,d){var e=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||e?this.each(function(){var f=e?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(S("toggle",3),a,b,d);return this},fadeTo:function(a,b,d,e){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d,e)},animate:function(a,b,d,e){var f=c.speed(b,
-d,e);if(c.isEmptyObject(a))return this.each(f.complete);return this[f.queue===false?"each":"queue"](function(){var h=c.extend({},f),l,k=this.nodeType===1,o=k&&c(this).is(":hidden"),x=this;for(l in a){var r=c.camelCase(l);if(l!==r){a[r]=a[l];delete a[l];l=r}if(a[l]==="hide"&&o||a[l]==="show"&&!o)return h.complete.call(this);if(k&&(l==="height"||l==="width")){h.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(c.css(this,"display")==="inline"&&c.css(this,"float")==="none")if(c.support.inlineBlockNeedsLayout)if(qa(this.nodeName)===
-"inline")this.style.display="inline-block";else{this.style.display="inline";this.style.zoom=1}else this.style.display="inline-block"}if(c.isArray(a[l])){(h.specialEasing=h.specialEasing||{})[l]=a[l][1];a[l]=a[l][0]}}if(h.overflow!=null)this.style.overflow="hidden";h.curAnim=c.extend({},a);c.each(a,function(A,C){var J=new c.fx(x,h,A);if(vb.test(C))J[C==="toggle"?o?"show":"hide":C](a);else{var w=wb.exec(C),I=J.cur()||0;if(w){var L=parseFloat(w[2]),g=w[3]||"px";if(g!=="px"){c.style(x,A,(L||1)+g);I=(L||
-1)/J.cur()*I;c.style(x,A,I+g)}if(w[1])L=(w[1]==="-="?-1:1)*L+I;J.custom(I,L,g)}else J.custom(I,C,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var e=d.length-1;e>=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
-d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
-Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
-var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
-this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
-this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
-c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},interval:13,stop:function(){clearInterval(ba);ba=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===
-b.elem}).length};var xb=/^t(?:able|d|h)$/i,Ia=/^(?:body|html)$/i;c.fn.offset="getBoundingClientRect"in t.documentElement?function(a){var b=this[0],d;if(a)return this.each(function(l){c.offset.setOffset(this,a,l)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);try{d=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,h=f.documentElement;if(!d||!c.contains(h,b))return d||{top:0,left:0};b=f.body;f=fa(f);return{top:d.top+(f.pageYOffset||c.support.boxModel&&
-h.scrollTop||b.scrollTop)-(h.clientTop||b.clientTop||0),left:d.left+(f.pageXOffset||c.support.boxModel&&h.scrollLeft||b.scrollLeft)-(h.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(x){c.offset.setOffset(this,a,x)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d,e=b.offsetParent,f=b.ownerDocument,h=f.documentElement,l=f.body;d=(f=f.defaultView)?f.getComputedStyle(b,null):b.currentStyle;
-for(var k=b.offsetTop,o=b.offsetLeft;(b=b.parentNode)&&b!==l&&b!==h;){if(c.offset.supportsFixedPosition&&d.position==="fixed")break;d=f?f.getComputedStyle(b,null):b.currentStyle;k-=b.scrollTop;o-=b.scrollLeft;if(b===e){k+=b.offsetTop;o+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&xb.test(b.nodeName))){k+=parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}e=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"){k+=
-parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}d=d}if(d.position==="relative"||d.position==="static"){k+=l.offsetTop;o+=l.offsetLeft}if(c.offset.supportsFixedPosition&&d.position==="fixed"){k+=Math.max(h.scrollTop,l.scrollTop);o+=Math.max(h.scrollLeft,l.scrollLeft)}return{top:k,left:o}};c.offset={initialize:function(){var a=t.body,b=t.createElement("div"),d,e,f,h=parseFloat(c.css(a,"marginTop"))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",
-height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);d=b.firstChild;e=d.firstChild;f=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=e.offsetTop!==5;this.doesAddBorderForTableAndCells=
-f.offsetTop===5;e.style.position="fixed";e.style.top="20px";this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15;e.style.position=e.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==h;a.removeChild(b);c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.css(a,
-"marginTop"))||0;d+=parseFloat(c.css(a,"marginLeft"))||0}return{top:b,left:d}},setOffset:function(a,b,d){var e=c.css(a,"position");if(e==="static")a.style.position="relative";var f=c(a),h=f.offset(),l=c.css(a,"top"),k=c.css(a,"left"),o=e==="absolute"&&c.inArray("auto",[l,k])>-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
-e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
-c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
-c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
-b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
-
-
-
-
-
-
-
-
-
-
-/*!
- * jQuery UI 1.8.6
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.6",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
-NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
-"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
-if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
-"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
-d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
-c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
-b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-;/*!
- * jQuery UI Widget 1.8.6
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
-a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
-e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
-this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
-widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
-enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
-;/*!
- * jQuery UI Mouse 1.8.6
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
-(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(a._preventClickEvent){a._preventClickEvent=false;b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&
-this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();
-return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&
-this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=a.target==this._mouseDownEvent.target;this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-
-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-;/*
- * jQuery UI Position 1.8.6
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
-left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
-k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+parseInt(c.curCSS(this,"marginRight",true))||0,w=m+q+parseInt(c.curCSS(this,"marginBottom",true))||0,i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=m/2;
-i.left=parseInt(i.left);i.top=parseInt(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=d>0?
-b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
-a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
-g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
-;/*
- * jQuery UI Progressbar 1.8.6
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar
- *
- * Depends:
- *   jquery.ui.core.js
- *   jquery.ui.widget.js
- */
-(function(b,c){b.widget("ui.progressbar",{options:{value:0},min:0,max:100,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
-this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===c)return this._value();this._setOption("value",a);return this},_setOption:function(a,d){if(a==="value"){this.options.value=d;this._refreshValue();this._trigger("change");this._value()===this.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.max,Math.max(this.min,a))},_refreshValue:function(){var a=
-this.value();this.valueDiv.toggleClass("ui-corner-right",a===this.max).width(a+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.6"})})(jQuery);
-;

src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js

@@ -122,6 +122,7 @@
     $(function () {
         $.tree.plugins.contextmenu.object.hide().appendTo("body");
         $("a", $.tree.plugins.contextmenu.object[0])
+            //has to be .live, do not change to .on, it doesn't work
 			.live("click", function (event) {
 			    if (!$(this).hasClass("disabled")) {
 			        $.tree.plugins.contextmenu.exec.apply(null, [$(this).attr("rel")]);

src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.js

@@ -395,6 +395,7 @@
                 //** THIS IS A MODIFICATION TO JSTREE, IN FIREFOX THE ORIGINAL CONTEXT OF THIS SELECTOR IS LOST IN THE TINY MCE OVERLAY
                 //$("li", this.container.get(0))
                 $("#" + this.container.attr("id") + " li")
+                    //has to be .live, do not change to .on, it doesn't work
 					.live("click", function (event) { // WHEN CLICK IS ON THE ARROW
 					    if (event.target.tagName != "LI") return true;
 					    _this.off_height();
@@ -404,6 +405,7 @@
 					    return false;
 					});
                 $("a", this.container.get(0))
+                    //has to be .live, do not change to .on, it doesn't work
 					.live("click", function (event) { // WHEN CLICK IS ON THE TEXT OR ICON
 					    if (event.which && event.which == 3) return true;
 					    if (_this.locked) {
@@ -417,6 +419,7 @@
 					    event.target.blur();
 					    return false;
 					})
+                    //has to be .live, do not change to .on, it doesn't work
 					.live("dblclick", function (event) { // WHEN DOUBLECLICK ON TEXT OR ICON
 					    if (_this.locked) {
 					        event.preventDefault();
@@ -429,6 +432,7 @@
 					    event.stopPropagation();
 					    event.target.blur();
 					})
+                    //has to be .live, do not change to .on, it doesn't work
 					.live("contextmenu", function (event) {
 					    if (_this.locked) {
 					        event.target.blur();
@@ -436,6 +440,7 @@
 					    }
 					    return _this.callback("onrgtclk", [_this.get_node(event.target).get(0), _this, event]);
 					})
+                    //has to be .live, do not change to .on, it doesn't work
 					.live("mouseover", function (event) {
 					    if (_this.locked) {
 					        event.preventDefault();
@@ -448,6 +453,7 @@
 					    }
 					    _this.callback("onhover", [_this.get_node(event.target).get(0), _this]);
 					})
+                    //has to be .live, do not change to .on, it doesn't work
 					.live("mousedown", function (event) {
 					    if (_this.settings.rules.drag_button == "left" && event.which && event.which != 1) return true;
 					    if (_this.settings.rules.drag_button == "right" && event.which && event.which != 3) return true;

src/Umbraco.Web.UI/web.Template.config

@@ -381,6 +381,11 @@
 				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
 			</dependentAssembly>
 
+      <dependentAssembly>
+        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
+      
 			<dependentAssembly>
 				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />

src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs

@@ -77,6 +77,8 @@ namespace Umbraco.Web.Cache
 
         public override void RefreshAll()
         {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey);
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey);
             ClearAllIsolatedCacheByEntityType<IContent>();
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
             DistributedCache.Instance.ClearDomainCacheOnCurrentServer();
@@ -85,6 +87,8 @@ namespace Umbraco.Web.Cache
 
         public override void Refresh(int id)
         {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey);
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey);
             ClearRepositoryCacheItemById(id);
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
             content.Instance.UpdateSortOrder(id);
@@ -94,6 +98,8 @@ namespace Umbraco.Web.Cache
 
         public override void Remove(int id)
         {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey);
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey);
             ClearRepositoryCacheItemById(id);
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
             DistributedCache.Instance.ClearDomainCacheOnCurrentServer();
@@ -103,6 +109,8 @@ namespace Umbraco.Web.Cache
 
         public override void Refresh(IContent instance)
         {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey);
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey);
             ClearRepositoryCacheItemById(instance.Id);
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
             content.Instance.UpdateSortOrder(instance);
@@ -112,6 +120,8 @@ namespace Umbraco.Web.Cache
 
         public override void Remove(IContent instance)
         {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey);
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey);
             ClearRepositoryCacheItemById(instance.Id);
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
             DistributedCache.Instance.ClearDomainCacheOnCurrentServer();
@@ -124,6 +134,8 @@ namespace Umbraco.Web.Cache
         /// <param name="jsonPayload"></param>
         public void Refresh(string jsonPayload)
         {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.IdToKeyCacheKey);
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(CacheKeys.KeyToIdCacheKey);
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
 
             foreach (var payload in DeserializeFromJsonPayload(jsonPayload))