Update dll to v1.12.1

This reverts commit f4e449f030.

Conflicts:
	app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.Logging;
 
 namespace Archetype.Models
 {
@@ -48,22 +47,6 @@ namespace Archetype.Models
         /// <returns></returns>
         public string SerializeForPersistence()
         {
-            //clean out any properties with a null datatype
-            foreach (var fieldset in Fieldsets)
-            {
-                var properties = fieldset.Properties.ToList();
-
-                foreach (var property in fieldset.Properties)
-                {
-                    if (property.DataTypeGuid == null)
-                    {
-                        properties.Remove(property);
-                    }
-                }
-
-                fieldset.Properties = properties;
-            }
-
             var json = JObject.Parse(JsonConvert.SerializeObject(this, new JsonSerializerSettings() { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
 
             var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType", "editorState" };

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.12.0")]
-[assembly: AssemblyFileVersion("1.12.0")]
+[assembly: AssemblyVersion("1.12.1")]
+[assembly: AssemblyFileVersion("1.12.1")]

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.12.0",
+	"version": "1.12.1",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",