More merge

src/Umbraco.Core/Constants-Applications.cs

@@ -112,9 +112,15 @@
 
             public const string Languages = "languages";
 
+            public const string PartialViews = "partialViews";
+
+            public const string PartialViewMacros = "partialViewMacros";
+
+            public const string Scripts = "scripts";
+
             //TODO: Fill in the rest!
         }
-	}
+    }
 
    
 }

src/Umbraco.Core/Services/MediaService.cs

@@ -1378,23 +1378,7 @@ namespace Umbraco.Core.Services
                 _mediaFileSystem.GenerateThumbnails(filestream, filepath, propertyType);
             }
         }
-
-        /// <summary>
-        /// Hack: This is used to fix some data if an entity's properties are invalid/corrupt
-        /// </summary>
-        /// <param name="media"></param>
-        private void QuickUpdate(IMedia media)
-        {
-            if (media == null) throw new ArgumentNullException("media");
-            if (media.HasIdentity == false) throw new InvalidOperationException("Cannot update an entity without an Identity");
-
-            var uow = UowProvider.GetUnitOfWork();
-            using (var repository = RepositoryFactory.CreateMediaRepository(uow))
-            {
-                repository.AddOrUpdate(media);
-                uow.Commit();
-            }
-        }
+        
 
         #region Event Handlers