Bump the version number

Sync up dev

.gitignore

@@ -13,7 +13,7 @@ $RECYCLE.BIN/
 app/less/*.css
 dist/
 node_modules/
-pkg/tmp/
+tmp/
 pkg/*.nupkg
 pkg/*.zip
 
@@ -23,6 +23,7 @@ pkg/*.zip
 [Bb]in/
 [Oo]bj/
 [Pp]ackages/
+VersionInfo.cs
 
 *.aps
 *.bak

Gruntfile.js

@@ -0,0 +1,216 @@
+module.exports = function(grunt) {
+  require('load-grunt-tasks')(grunt);
+  var path = require('path')
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    pkgMeta: grunt.file.readJSON('config/meta.json'),
+    dest: grunt.option('target') || 'dist',
+    basePath: path.join('<%= dest %>', 'App_Plugins', '<%= pkgMeta.name %>'),
+
+    watch: {
+      options: {
+        spawn: false,
+        atBegin: true
+      },
+
+      less: {
+        files: ['app/**/*.less'],
+        tasks: ['less:dist']
+      },
+
+      js: {
+        files: ['app/**/*.js'],
+        tasks: ['concat:dist']
+      },
+
+      html: {
+        files: ['app/**/*.html'],
+        tasks: ['copy:html']
+      },
+
+      dll: {
+        files: ['app/Umbraco/**/*.dll'],
+        tasks: ['copy:dll']
+      }
+    },
+
+    less: {
+      dist: {
+        options: {
+          paths: ["app/less", "lib/less", "vendor"],
+        },
+        files: {
+          '<%= basePath %>/css/archetype.css': 'app/less/archetype.less',
+        }
+      }
+    },
+
+    concat: {
+      options: {
+        stripBanners: false
+      },
+      dist: {
+        src: [
+          'app/controllers/controller.js',
+          'app/controllers/config.controller.js',
+          'app/directives/archetypeproperty.js',
+          'app/directives/archetypecustomview.js',
+          'app/directives/localize.js',
+          'app/services/localization.js',
+          'app/resources/propertyeditor.js'
+        ],
+        dest: '<%= basePath %>/js/archetype.js'
+      }
+    },
+
+    copy: {
+      html: {
+        cwd: 'app/views/',
+        src: ['archetype.html', 'archetype.default.html', 'archetype.config.html'],
+        dest: '<%= basePath %>/views',
+        expand: true
+      },
+      dll: {
+        cwd: 'app/Umbraco/Umbraco.Archetype/bin/Release/',
+        src: 'Archetype.dll',
+        dest: '<%= dest %>/bin/',
+        expand: true
+      },
+      config: {
+        files: [
+          {
+            cwd: 'app/langs/',
+            src: ['**'],
+            dest: '<%= basePath %>/langs',
+            expand: true
+          }
+        ]
+      },
+      nuget: {
+        files: [
+          {
+            cwd: '<%= dest %>',
+            src: ['**/*', '!bin', '!bin/*'],
+            dest: 'tmp/nuget/content',
+            expand: true
+          },
+          {
+            cwd: '<%= dest %>/bin',
+            src: ['*.dll'],
+            dest: 'tmp/nuget/lib/net40',
+            expand: true
+          }
+        ]
+      },
+      umbraco: {
+        cwd: '<%= dest %>',
+        src: '**/*',
+        dest: 'tmp/umbraco',
+        expand: true
+      }
+    },
+
+    nugetpack: {
+    	dist: {
+    		src: 'tmp/nuget/package.nuspec',
+    		dest: 'pkg'
+    	}
+    },
+
+    template: {
+    	'nuspec': {
+			'options': {
+    			'data': { 
+            name: '<%= pkgMeta.name %>',
+    				version: '<%= pkgMeta.version %>',
+            url: '<%= pkgMeta.url %>',
+            license: '<%= pkgMeta.license %>',
+            licenseUrl: '<%= pkgMeta.licenseUrl %>',
+            author: '<%= pkgMeta.author %>',
+            authorUrl: '<%= pkgMeta.authorUrl %>',
+
+    				files: [{ path: 'tmp/nuget/**', target: 'content/App_Plugins/Archetype'}]
+	    		}
+    		},
+    		'files': { 
+    			'tmp/nuget/package.nuspec': ['config/package.nuspec']
+    		}
+    	}
+    },
+
+    umbracoPackage: {
+      options: {
+        name: "<%= pkgMeta.name %>",
+        version: '<%= pkgMeta.version %>',
+        url: '<%= pkgMeta.url %>',
+        license: '<%= pkgMeta.license %>',
+        licenseUrl: '<%= pkgMeta.licenseUrl %>',
+        author: '<%= pkgMeta.author %>',
+        authorUrl: '<%= pkgMeta.authorUrl %>',
+        manifest: 'config/package.xml',
+        readme: 'config/readme.txt',
+        sourceDir: 'tmp/umbraco',
+        outputDir: 'pkg',
+      }
+    },
+
+    clean: {
+      build: '<%= grunt.config("basePath").substring(0, 4) == "dist" ? "dist/**/*" : "null" %>',
+      tmp: ['tmp']
+    },
+
+    assemblyinfo: {
+      options: {
+        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
+        filename: 'VersionInfo.cs',
+        info: {
+          version: '<%= (pkgMeta.version.indexOf("-") ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 
+          fileVersion: '<%= pkgMeta.version %>'
+        }
+      }
+    },
+
+    touch: {
+      webconfig: {
+        src: ['<%= grunt.option("target") %>\\Web.config']
+      }
+    },
+
+    jshint: {
+      options: {
+        jshintrc: '.jshintrc'
+      },
+      src: {
+        src: ['app/**/*.js', 'lib/**/*.js']
+      }
+    },
+
+    msbuild: {
+      options: {
+        stdout: true,
+        verbosity: 'quiet',
+        maxCpuCount: 4,
+		version: 4.0,
+        buildParameters: {
+          WarningLevel: 2,
+          NoWarn: 1607
+        }
+      },
+      dist: {
+        src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
+        options: {
+          projectConfiguration: 'Release',
+          targets: ['Clean', 'Rebuild'],
+        }
+      }
+    }
+
+  });
+
+  grunt.registerTask('default', ['clean', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:config', 'copy:html']);
+
+  grunt.registerTask('nuget',   ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'clean:tmp']);
+  grunt.registerTask('umbraco', ['clean:tmp', 'default', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
+  grunt.registerTask('package', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
+};

LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Imulus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -0,0 +1,39 @@
+Archetype
+=========
+![alt tag](http://imulus.github.io/Archetype/images/logo.png)
+
+![alt tag](http://imulus.github.io/Archetype/images/example1.png)
+
+## Installation
+Install the selected <a href='https://github.com/imulus/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.
+
+
+## Official Docs ##
+http://imulus.github.io/Archetype
+
+Follow us on Twitter https://twitter.com/ArchetypeKit
+
+## Contribute ##
+
+Want to contribute to Archetype?  You'll want to use Grunt (our task runner) to help you integrate with a local copy of Umbraco.
+
+### Install Dependencies ###
+*Requires Node.js to be installed and in your system path*
+
+    npm install -g grunt-cli && npm install -g grunt
+    npm install
+
+### Build ###
+    grunt
+
+   Builds the project to `/dist/`.  These files can be dropped into an Umbraco 7 site, or you can build directly to a site using:
+
+    grunt --target="D:\inetpub\mysite"
+
+You can also watch for changes using:
+
+    grunt watch
+    grunt watch --target="D:\inetpub\mysite"
+
+
+Add `--touch` to either command to automatically touch the web.config on a deploy

app/Umbraco/.nuget/NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>

app/Umbraco/.nuget/NuGet.targets

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+        
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">true</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">false</RequireRestoreConsent>
+        
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+    
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+        <PackagesConfig>packages.config</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+        
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+        
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+        
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+              
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)" 
+              Condition=" '$(OS)' != 'Windows_NT' " />
+              
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+    
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>

app/Umbraco/Archetype.Tests/Archetype.Tests.csproj

@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Archetype.Tests</RootNamespace>
+    <AssemblyName>Archetype.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="AutoMapper.Net4">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+    </Reference>
+    <Reference Include="businesslogic, Version=1.0.5242.22740, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core">
+      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc">
+      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="cms, Version=1.0.5242.22741, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+    </Reference>
+    <Reference Include="controls, Version=1.0.5242.22742, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
+    </Reference>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="Examine, Version=0.1.55.2941, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack">
+      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor.Web, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="interfaces, Version=1.0.5242.22737, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler">
+      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLCE4Umbraco, Version=1.0.5242.22741, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco, Version=1.0.5242.22743, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Core, Version=1.0.5242.22738, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.DataLayer, Version=1.0.5242.22740, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.editorControls, Version=1.0.5242.22746, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.MacroEngines, Version=1.0.5242.22747, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.providers, Version=1.0.5242.22742, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=1.0.5242.22748, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.XmlSerializers, Version=1.0.5242.22743, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
+    </Reference>
+    <Reference Include="UmbracoExamine, Version=0.6.0.22741, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
+    </Reference>
+    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Models\FieldsetTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
+    <Compile Include="Serialization\ArchetypeJsonConverterComplexModelTest.cs" />
+    <Compile Include="Serialization\ArchetypeJsonConverterTest.cs" />
+    <Compile Include="Serialization\JsonTestStrings.cs" />
+    <Compile Include="Serialization\JsonTestModels.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="Data\sample-1.json" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Archetype\Archetype.Umbraco.csproj">
+      <Project>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</Project>
+      <Name>Archetype.Umbraco</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

app/Umbraco/Archetype.Tests/Data/sample-1.json

@@ -0,0 +1 @@
+{"fieldsets":[{"alias":"archUi","properties":[{"alias":"blurb","value":"A blurb here"},{"alias":"boxHeadline","value":"Box 1 Title"},{"alias":"link","value":"3175"},{"alias":"show","value":"1"}],"remove":false,"collapse":true,"isValid":true},{"alias":"archUi","properties":[{"alias":"boxHeadline","value":"Another Box"},{"alias":"blurb","value":"Some content"},{"alias":"link","value":"3175"},{"alias":"show","value":"0"}],"remove":false,"collapse":true,"isValid":true}]}

app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Archetype.PropertyConverters;
+using NUnit.Framework;
+
+namespace Archetype.Tests.Models
+{
+
+    [TestFixture]
+    public class FieldsetTests
+    {
+
+        private string _sampleJson;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _sampleJson = File.ReadAllText("..\\..\\Data\\sample-1.json");
+        }
+
+        [Test]
+        public void Can_Get_Fieldset_Property_By_Alias()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+            var propertyValue = fieldset.GetValue("boxHeadline");
+
+            Assert.That(propertyValue == "Box 1 Title");
+        }
+
+        [Test]
+        public void Can_Convert_Property_Value_Types()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+
+            Assert.That(fieldset.GetValue<int>("link") == 3175);
+            Assert.That(fieldset.GetValue<bool>("show") == true);
+            Assert.That(fieldset.GetValue<string>("blurb") == "A blurb here");
+        }
+
+        [Test]
+        public void Returns_String_When_No_Type_Specified()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+
+            var property = fieldset.GetValue("link");
+            Assert.That(property is string);
+            Assert.That(property == "3175");
+        }
+
+    }
+}

app/Umbraco/Archetype.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Archetype.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Archetype.Tests")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("de11df59-e1eb-4aae-87fd-59c33606a1f5")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Archetype.PropertyConverters;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Archetype.Tests.PropertyValueConverter
+{
+    [TestFixture]
+    public class PropertyValueConverterTests
+    {
+
+        private string _sampleJson;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _sampleJson = File.ReadAllText("..\\..\\Data\\sample-1.json");
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        public void Returns_Empty_Archetype_When_Data_Is_Null_Or_Empty(object data)
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = converter.ConvertDataToSource(null, data, false);
+
+            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
+
+            var fieldsets = (Archetype.Models.ArchetypeModel) result;
+            Assert.IsTrue(fieldsets.Count() == 0);
+        }
+
+        [Test]
+        public void Returns_Empty_Archetype_When_Data_Is_Invalid_Json()
+        {
+            var data = "{ invalid";
+            var converter = new ArchetypeValueConverter();
+            var result = converter.ConvertDataToSource(null, data, false);
+            
+            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
+
+            var fieldsets = (Archetype.Models.ArchetypeModel) result;
+            Assert.IsTrue(fieldsets.Count() == 0);
+        }
+
+        [Test]
+        public void Can_Serialize_From_Json_Model()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            Assert.That(result != null);
+            Assert.That(result.Fieldsets.Count() == 2);
+        }
+    }
+}

app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs

@@ -0,0 +1,216 @@
+using System.Linq;
+using Archetype.PropertyConverters;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace Archetype.Tests.Serialization
+{
+    [TestFixture]
+    public class ArchetypeJsonConverterComplexModelTest
+    {
+        private TextList _textList;
+        private Captions _captions;
+        private PageDetails _pageDetails;
+
+        private SlideShow _slides;
+        private Seo _seo;
+        private TextPageList _textPages;
+        private PageList _pages;
+        
+        [SetUp]
+        public void SetUp()
+        {
+            InitComplexModels();
+            InitComplexTreeModel();
+        }
+
+        #region complex nested model tests
+
+        [Test]
+        public void PageDetailsModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._PAGE_DETAILS_JSON, result);
+        }
+
+        [Test]
+        public void ConvertComplexModelToArchetype()
+        {
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void DeserializeComplexModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<PageDetails>(JsonTestStrings._PAGE_DETAILS_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageDetails>(result);
+
+            Assert.AreEqual("2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453", result.Pages);
+            Assert.AreEqual("First Page", result.Captions.TextStringArray.ElementAt(0).TextString);
+            Assert.AreEqual("Second Page", result.Captions.TextStringArray.ElementAt(1).TextString);
+            Assert.AreEqual("Third Page", result.Captions.TextStringArray.ElementAt(2).TextString);
+            Assert.AreEqual("Fourth Page", result.Captions.TextStringArray.ElementAt(3).TextString);
+        }
+
+        [Test]
+        public void SerializeThenDeserializeComplexModelFromArchetype()
+        {
+            var json = JsonConvert.SerializeObject(_pageDetails);
+            var result = JsonConvert.DeserializeObject<PageDetails>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageDetails>(result);
+
+            Assert.AreEqual(_pageDetails.Pages, result.Pages);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(0).TextString, result.Captions.TextStringArray.ElementAt(0).TextString);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(1).TextString, result.Captions.TextStringArray.ElementAt(1).TextString);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(2).TextString, result.Captions.TextStringArray.ElementAt(2).TextString);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(3).TextString, result.Captions.TextStringArray.ElementAt(3).TextString);
+        }
+        #endregion
+
+        #region complex nested tree model tests
+
+        [Test]
+        public void ConvertComplexNestedModelToArchetype()
+        {
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(_pages, Formatting.Indented);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void PagesModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_pages, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._PAGES_JSON, result);
+        }
+
+        [Test]
+        public void DeserializeComplexTreeModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<PageList>(JsonTestStrings._PAGES_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageList>(result);
+
+            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(0).Media.Slides);
+            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(1).Media.Slides);
+            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(2).Media.Slides);
+
+            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(0).Seo.MetaTitle);
+            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(0).Seo.MetaDescription);
+            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(1).Seo.MetaTitle);
+            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(1).Seo.MetaDescription);
+            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(2).Seo.MetaTitle);
+            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(2).Seo.MetaDescription);
+
+            Assert.AreEqual("Home Page Body", result.Pages.ElementAt(0).BodyText);
+            Assert.AreEqual("Home Page", result.Pages.ElementAt(0).PageTitle);
+            Assert.AreEqual("About us Page Body", result.Pages.ElementAt(1).BodyText);
+            Assert.AreEqual("About us Page", result.Pages.ElementAt(1).PageTitle);
+            Assert.AreEqual("Contact us Page Body", result.Pages.ElementAt(2).BodyText);
+            Assert.AreEqual("Contact us Page", result.Pages.ElementAt(2).PageTitle);
+
+
+        }
+
+        [Test]
+        public void SerializeThenDeserializeComplexTreeModelFromArchetype()
+        {
+            var json = JsonConvert.SerializeObject(_pages);
+            var result = JsonConvert.DeserializeObject<PageList>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageList>(result);
+
+            Assert.AreEqual(_pages.Pages.ElementAt(0).Media.Slides, result.Pages.ElementAt(0).Media.Slides);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).Media.Slides, result.Pages.ElementAt(1).Media.Slides);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).Media.Slides, result.Pages.ElementAt(2).Media.Slides);
+
+            Assert.AreEqual(_pages.Pages.ElementAt(0).Seo.MetaTitle, result.Pages.ElementAt(0).Seo.MetaTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(0).Seo.MetaDescription, result.Pages.ElementAt(0).Seo.MetaDescription);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).Seo.MetaTitle, result.Pages.ElementAt(1).Seo.MetaTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).Seo.MetaDescription, result.Pages.ElementAt(1).Seo.MetaDescription);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).Seo.MetaTitle, result.Pages.ElementAt(2).Seo.MetaTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).Seo.MetaDescription, result.Pages.ElementAt(2).Seo.MetaDescription);
+
+            Assert.AreEqual(_pages.Pages.ElementAt(0).BodyText, result.Pages.ElementAt(0).BodyText);
+            Assert.AreEqual(_pages.Pages.ElementAt(0).PageTitle, result.Pages.ElementAt(0).PageTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).BodyText, result.Pages.ElementAt(1).BodyText);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).PageTitle, result.Pages.ElementAt(1).PageTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).BodyText, result.Pages.ElementAt(2).BodyText);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).PageTitle, result.Pages.ElementAt(2).PageTitle);
+
+
+        }
+
+        #endregion
+
+        #region utility methods
+
+        private void InitComplexModels()
+        {
+            _textList = new TextList
+            {
+                new TextItem{TextString = "First Page"},
+                new TextItem{TextString = "Second Page"},
+                new TextItem{TextString = "Third Page"},
+                new TextItem{TextString = "Fourth Page"}
+            };
+
+            _captions = new Captions {TextStringArray = _textList};
+
+            _pageDetails = new PageDetails
+            {
+                Captions = _captions,
+                Pages = "2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453"
+            };            
+        }
+
+        private void InitComplexTreeModel()
+        {
+            _slides = new SlideShow{Slides = "1,2,3,4,5,6,7,8"};
+            _seo = new Seo{MetaDescription = "Test Meta Description", MetaTitle = "Test Meta Title"};
+            _textPages = new TextPageList
+            {
+                new TextPage()
+                {
+                    PageTitle = "Home Page",
+                    BodyText = "Home Page Body",
+                    Media = _slides,
+                    Seo = _seo
+                },
+                new TextPage()
+                {
+                    PageTitle = "About us Page",
+                    BodyText = "About us Page Body",
+                    Media = _slides,
+                    Seo = _seo
+                },
+                new TextPage()
+                {
+                    PageTitle = "Contact us Page",
+                    BodyText = "Contact us Page Body",
+                    Media = _slides,
+                    Seo = _seo
+                }
+            };
+
+            _pages = new PageList
+            {
+                Pages = _textPages
+            };
+        }
+
+        #endregion
+    }
+}

app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs

@@ -0,0 +1,367 @@
+using System;
+using Archetype.PropertyConverters;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace Archetype.Tests.Serialization
+{
+    [TestFixture]
+    public class ArchetypeJsonConverterTest
+    {
+        private ContactDetails _contactDetails;
+        private CompanyDetails _companyDetails;
+        private AnnualStatement _annualStatement;
+        private MergerDetails _mergerDetails;
+        private UrlPicker _webSite;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _webSite = new UrlPicker
+            {
+                Url = "http://test.com",
+                Title = "The Test Company",
+                OpenInNewWindow = true
+            };
+
+            _mergerDetails = new MergerDetails
+            {
+                MergerDate = new DateTime(2014,6,7,8,9,10),
+                MergerValue = 12345676890.12m
+            };
+
+            _contactDetails = new ContactDetails
+            {
+                Address = "Test Address",
+                Email = "test@test.com",
+                Fax = "000",
+                Mobile = "000",
+                Name = "Test",
+                Telephone = "111",
+                WebSite = _webSite
+            };
+
+            _companyDetails = new CompanyDetails
+            {
+                Region = "Test Region",
+                ContactDetails = _contactDetails
+            };
+
+            _annualStatement = new AnnualStatement
+            {
+                FiscalYearStart = new DateTime(2013, 9, 1),
+                FiscalYearEnd = new DateTime(2014, 8, 31),
+                TotalShares = 345678,
+                Sales = 123456700.89,
+                Profit = 1123456.78m
+            };
+        }
+
+        #region serialization tests
+
+        [Test]
+        public void MergerDetailsModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_mergerDetails, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._MERGER_DETAILS_JSON, result);
+        }        
+        
+        [Test]
+        public void ContactDetailsModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_contactDetails, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._CONTACT_DETAILS_JSON, result);
+        }
+
+        [Test]
+        public void CompanyDetailsModel_Fieldset_Serializes_As_Expected()
+        {
+            var result = JsonConvert.SerializeObject(_companyDetails, Formatting.Indented);
+
+            Assert.AreEqual(JsonTestStrings._COMPANY_DETAILS_JSON, result);
+
+        }
+
+        [Test]
+        public void AnnualStatementModel_Fieldset_Serializes_As_Expected()
+        {
+            var result = JsonConvert.SerializeObject(_annualStatement, Formatting.Indented);
+
+            Assert.AreEqual(JsonTestStrings._ANNUAL_STATEMENT_JSON, result);
+
+        }
+
+        [Test]
+        public void NullValues_Serialize_To_Empty_String()
+        {
+            var result = JsonConvert.SerializeObject(new ContactDetails());
+
+            Assert.AreEqual(JsonTestStrings._NULL_VALUES_JSON, result);
+
+        }
+
+        [Test]
+        public void ConvertModelToArchetype()
+        {
+            var model = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertNumericAndDateModelToArchetype()
+        {
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(_annualStatement);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertCompoundModelToArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new AllContactDetails
+            {
+                UserDetails = item1,
+                AdminDetails = item2
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertEnumerableModelToArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new ContactDetailsList
+            {
+                item1,
+                item2
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertNestedModelToArchetype()
+        {
+            var model = new CompanyDetails
+            {
+                Region = "Test Region",
+                ContactDetails = new ContactDetails
+                {
+                    Address = "addr1",
+                    Name = "email2"
+                }
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        #endregion
+
+        #region deserialization tests
+
+        [Test]
+        public void DeserializeModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<ContactDetails>(JsonTestStrings._CONTACT_DETAILS_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<ContactDetails>(result);
+
+            Assert.AreEqual("Test Address", result.Address);
+            Assert.AreEqual("test@test.com", result.Email);
+            Assert.AreEqual("000", result.Fax);
+            Assert.AreEqual("000", result.Mobile);
+            Assert.AreEqual("Test", result.Name);
+            Assert.AreEqual("111", result.Telephone);
+            Assert.AreEqual(_webSite.Content, result.WebSite.Content);
+            Assert.AreEqual(_webSite.Media, result.WebSite.Media);
+            Assert.AreEqual(_webSite.OpenInNewWindow, result.WebSite.OpenInNewWindow);
+            Assert.AreEqual(_webSite.Title, result.WebSite.Title);
+            Assert.AreEqual(_webSite.Url, result.WebSite.Url);
+        }
+
+        [Test]
+        public void DeserializeNumericAndDateModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<AnnualStatement>(JsonTestStrings._ANNUAL_STATEMENT_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<AnnualStatement>(result);
+
+            Assert.AreEqual(new DateTime(2013, 9, 1), result.FiscalYearStart);
+            Assert.AreEqual(new DateTime(2014, 8, 31), result.FiscalYearEnd);
+            Assert.IsNull(result.DividendPaymentDate);
+            Assert.AreEqual(345678, result.TotalShares);
+            Assert.AreEqual(123456700.89, result.Sales);
+            Assert.AreEqual(1123456.78m, result.Profit);
+        }
+
+        [Test]
+        public void DeserializeNumericAndDateModel_NullableDate_HasValue_FromArchetype()
+        {
+            var annualStatement = new AnnualStatement
+            {
+                FiscalYearStart = new DateTime(2013, 9, 1),
+                FiscalYearEnd = new DateTime(2014, 8, 31),
+                DividendPaymentDate = new DateTime(2014,9,15,10,15,30),
+                TotalShares = 345678,
+                Sales = 123456700.89,
+                Profit = 1123456.78m
+            };
+
+            var json = JsonConvert.SerializeObject(annualStatement);
+            var result = JsonConvert.DeserializeObject<AnnualStatement>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<AnnualStatement>(result);
+
+            Assert.AreEqual(annualStatement.FiscalYearStart, result.FiscalYearStart);
+            Assert.AreEqual(annualStatement.FiscalYearEnd, result.FiscalYearEnd);
+            Assert.AreEqual(annualStatement.DividendPaymentDate, result.DividendPaymentDate);
+            Assert.AreEqual(annualStatement.TotalShares, result.TotalShares);
+            Assert.AreEqual(annualStatement.Sales, result.Sales);
+            Assert.AreEqual(annualStatement.Profit, result.Profit);
+        }
+
+        [Test]
+        public void DeserializeCompoundModelFromArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new AllContactDetails
+            {
+                UserDetails = item1,
+                AdminDetails = item2
+            };
+
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var result = JsonConvert.DeserializeObject<AllContactDetails>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<AllContactDetails>(result);
+
+            Assert.AreEqual(item1.Address, result.UserDetails.Address);
+            Assert.AreEqual(item1.Email, result.UserDetails.Email);
+            Assert.AreEqual(item2.Address, result.AdminDetails.Address);
+            Assert.AreEqual(item2.Name, result.AdminDetails.Name);
+        }
+
+        [Test]
+        public void DeserializeEnumerableModelFromArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new ContactDetailsList
+            {
+                item1,
+                item2
+            };
+
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var result = JsonConvert.DeserializeObject<ContactDetailsList>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<ContactDetailsList>(result);
+            Assert.AreEqual(result.Count, 2);
+
+            Assert.AreEqual(item1.Address, result[0].Address);
+            Assert.AreEqual(item1.Email, result[0].Email);
+            Assert.AreEqual(item2.Address, result[1].Address);
+            Assert.AreEqual(item2.Name, result[1].Name);
+        }
+
+        [Test]
+        public void DeserializeNestedModelFromArchetype()
+        {
+            var model = new CompanyDetails
+            {
+                Region = "Test Region",
+                ContactDetails = new ContactDetails
+                {
+                    Address = "addr1",
+                    Name = "email2"
+                }
+            };
+
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var result = JsonConvert.DeserializeObject<CompanyDetails>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<CompanyDetails>(result);
+
+            Assert.AreEqual(model.Region, result.Region);
+            Assert.AreEqual(model.ContactDetails.Address, result.ContactDetails.Address);
+            Assert.AreEqual(model.ContactDetails.Name, result.ContactDetails.Name);
+        }
+
+        #endregion
+
+    }
+}

app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs

@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using Archetype.Serialization;
+using Newtonsoft.Json;
+
+namespace Archetype.Tests.Serialization
+{
+    #region json test Models
+
+    [AsArchetype("urlPicker")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class UrlPicker
+    {
+        [JsonProperty("title")]
+        public string Title { get; set; }
+        [JsonProperty("url")]
+        public string Url { get; set; }
+        [JsonProperty("content")]
+        public int? Content { get; set; }
+        [JsonProperty("media")]
+        public int? Media { get; set; }
+        [JsonProperty("openInNewWindow")]
+        public bool OpenInNewWindow { get; set; }
+    }
+
+    [AsArchetype("contactDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class ContactDetails
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+        [JsonProperty("address")]
+        public string Address { get; set; }
+        [JsonProperty("telephone")]
+        public string Telephone { get; set; }
+        [JsonProperty("mobile")]
+        public string Mobile { get; set; }
+        [JsonProperty("fax")]
+        public string Fax { get; set; }
+        [JsonProperty("email")]
+        public string Email { get; set; }
+        [JsonProperty("webSite")]
+        public UrlPicker WebSite { get; set; }
+    }
+
+    [AsArchetype("companyDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class CompanyDetails
+    {
+        [JsonProperty("region")]
+        public string Region { get; set; }
+        [JsonProperty("contactDetails")]
+        public ContactDetails ContactDetails { get; set; }
+    }
+
+    [AsArchetype("allContactDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class AllContactDetails
+    {
+        public ContactDetails UserDetails { get; set; }
+        public ContactDetails AdminDetails { get; set; }
+
+    }
+
+    [AsArchetype("contactDetailsList")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class ContactDetailsList : List<ContactDetails>
+    {
+    }
+
+    [AsArchetype("annualStatement")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class AnnualStatement
+    {
+        public DateTime FiscalYearStart { get; set; }
+        public DateTime FiscalYearEnd { get; set; }
+        public DateTime? DividendPaymentDate { get; set; }
+        public Int32 TotalShares { get; set; }
+        public Double Sales { get; set; }
+        public Decimal Profit { get; set; }
+    }
+
+    [AsArchetype("mergerDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class MergerDetails
+    {
+        public DateTime MergerDate { get; set; }
+        [JsonIgnore]
+        public decimal MergerValue { get; set; }
+    }
+
+    #endregion
+
+    #region complex nested model
+
+    [AsArchetype("pages")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class PageDetails
+    {
+        [JsonProperty("pages")]
+        public string Pages { get; set; }
+        [AsFieldset]
+        [JsonProperty("captions")]
+        public Captions Captions { get; set; }
+    }
+
+    [AsArchetype("captions")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class Captions
+    {
+        [JsonProperty("captions")]
+        public TextList TextStringArray { get; set; }
+    }
+
+    [AsArchetype("textstringArray")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class TextList : List<TextItem>
+    {
+    }
+
+    [AsArchetype("textstringArray")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class TextItem
+    {
+        [JsonProperty("textstring")]
+        public string TextString { get; set; }
+    }
+
+    #endregion
+
+    #region complex nested tree model
+
+    public abstract class PageBase
+    {
+        public string PageTitle { get; set; }
+        public string BodyText { get; set; }
+    }
+
+    [AsArchetype("slideShow")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class SlideShow
+    {
+        public string Slides { get; set; }
+    }
+
+    [AsArchetype("seo")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class Seo
+    {
+        public string MetaTitle { get; set; }
+        public string MetaDescription { get; set; }
+    }
+
+    [AsArchetype("TextPage")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class TextPage : PageBase
+    {
+        [AsFieldset]
+        public SlideShow Media { get; set; }
+
+        [AsFieldset]
+        public Seo Seo { get; set; }
+    }
+
+    [AsArchetype("TextPageList")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class TextPageList : List<TextPage>
+    {
+    }
+
+    [AsArchetype("Pages")]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
+    public class PageList
+    {
+        public TextPageList Pages { get; set; }
+    }
+
+    #endregion
+}

app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs

@@ -0,0 +1,435 @@
+namespace Archetype.Tests.Serialization
+{
+    public class JsonTestStrings
+    {
+        public const string _MERGER_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""mergerDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""MergerDate"",
+          ""value"": ""07/06/2014 08:09:10""
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _ANNUAL_STATEMENT_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""annualStatement"",
+      ""properties"": [
+        {
+          ""alias"": ""FiscalYearStart"",
+          ""value"": ""01/09/2013 00:00:00""
+        },
+        {
+          ""alias"": ""FiscalYearEnd"",
+          ""value"": ""31/08/2014 00:00:00""
+        },
+        {
+          ""alias"": ""DividendPaymentDate"",
+          ""value"": """"
+        },
+        {
+          ""alias"": ""TotalShares"",
+          ""value"": ""345678""
+        },
+        {
+          ""alias"": ""Sales"",
+          ""value"": ""123456700.89""
+        },
+        {
+          ""alias"": ""Profit"",
+          ""value"": ""1123456.78""
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _CONTACT_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""contactDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""name"",
+          ""value"": ""Test""
+        },
+        {
+          ""alias"": ""address"",
+          ""value"": ""Test Address""
+        },
+        {
+          ""alias"": ""telephone"",
+          ""value"": ""111""
+        },
+        {
+          ""alias"": ""mobile"",
+          ""value"": ""000""
+        },
+        {
+          ""alias"": ""fax"",
+          ""value"": ""000""
+        },
+        {
+          ""alias"": ""email"",
+          ""value"": ""test@test.com""
+        },
+        {
+          ""alias"": ""webSite"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""urlPicker"",
+                ""properties"": [
+                  {
+                    ""alias"": ""title"",
+                    ""value"": ""The Test Company""
+                  },
+                  {
+                    ""alias"": ""url"",
+                    ""value"": ""http://test.com""
+                  },
+                  {
+                    ""alias"": ""content"",
+                    ""value"": """"
+                  },
+                  {
+                    ""alias"": ""media"",
+                    ""value"": """"
+                  },
+                  {
+                    ""alias"": ""openInNewWindow"",
+                    ""value"": ""1""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _COMPANY_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""companyDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""region"",
+          ""value"": ""Test Region""
+        },
+        {
+          ""alias"": ""contactDetails"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""contactDetails"",
+                ""properties"": [
+                  {
+                    ""alias"": ""name"",
+                    ""value"": ""Test""
+                  },
+                  {
+                    ""alias"": ""address"",
+                    ""value"": ""Test Address""
+                  },
+                  {
+                    ""alias"": ""telephone"",
+                    ""value"": ""111""
+                  },
+                  {
+                    ""alias"": ""mobile"",
+                    ""value"": ""000""
+                  },
+                  {
+                    ""alias"": ""fax"",
+                    ""value"": ""000""
+                  },
+                  {
+                    ""alias"": ""email"",
+                    ""value"": ""test@test.com""
+                  },
+                  {
+                    ""alias"": ""webSite"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""urlPicker"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""title"",
+                              ""value"": ""The Test Company""
+                            },
+                            {
+                              ""alias"": ""url"",
+                              ""value"": ""http://test.com""
+                            },
+                            {
+                              ""alias"": ""content"",
+                              ""value"": """"
+                            },
+                            {
+                              ""alias"": ""media"",
+                              ""value"": """"
+                            },
+                            {
+                              ""alias"": ""openInNewWindow"",
+                              ""value"": ""1""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _PAGE_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""pages"",
+      ""properties"": [
+        {
+          ""alias"": ""pages"",
+          ""value"": ""2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453""
+        }
+      ]
+    },
+    {
+      ""alias"": ""captions"",
+      ""properties"": [
+        {
+          ""alias"": ""captions"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""First Page""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""Second Page""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""Third Page""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""Fourth Page""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _PAGES_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""Pages"",
+      ""properties"": [
+        {
+          ""alias"": ""Pages"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""TextPage"",
+                ""properties"": [
+                  {
+                    ""alias"": ""Media"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""slideShow"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""Slides"",
+                              ""value"": ""1,2,3,4,5,6,7,8""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""Seo"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""seo"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""MetaTitle"",
+                              ""value"": ""Test Meta Title""
+                            },
+                            {
+                              ""alias"": ""MetaDescription"",
+                              ""value"": ""Test Meta Description""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""PageTitle"",
+                    ""value"": ""Home Page""
+                  },
+                  {
+                    ""alias"": ""BodyText"",
+                    ""value"": ""Home Page Body""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""TextPage"",
+                ""properties"": [
+                  {
+                    ""alias"": ""Media"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""slideShow"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""Slides"",
+                              ""value"": ""1,2,3,4,5,6,7,8""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""Seo"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""seo"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""MetaTitle"",
+                              ""value"": ""Test Meta Title""
+                            },
+                            {
+                              ""alias"": ""MetaDescription"",
+                              ""value"": ""Test Meta Description""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""PageTitle"",
+                    ""value"": ""About us Page""
+                  },
+                  {
+                    ""alias"": ""BodyText"",
+                    ""value"": ""About us Page Body""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""TextPage"",
+                ""properties"": [
+                  {
+                    ""alias"": ""Media"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""slideShow"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""Slides"",
+                              ""value"": ""1,2,3,4,5,6,7,8""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""Seo"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""seo"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""MetaTitle"",
+                              ""value"": ""Test Meta Title""
+                            },
+                            {
+                              ""alias"": ""MetaDescription"",
+                              ""value"": ""Test Meta Description""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""PageTitle"",
+                    ""value"": ""Contact us Page""
+                  },
+                  {
+                    ""alias"": ""BodyText"",
+                    ""value"": ""Contact us Page Body""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
+    }
+}

app/Umbraco/Archetype.Tests/app.config

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.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" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

app/Umbraco/Archetype.Tests/packages.config

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
+  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
+  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="Moq" version="4.2.1312.1622" targetFramework="net45" />
+  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
+</packages>

app/Umbraco/DatabaseSizer/Application.cs

@@ -0,0 +1,49 @@
+using System;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+
+namespace DatabaseSizer
+{
+    public class Application : ApplicationEventHandler
+    {
+        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            base.ApplicationStarted(umbracoApplication, applicationContext);
+
+            ExpandPrevalueValueColumnSize();
+        }
+
+        protected void ExpandPrevalueValueColumnSize()
+        {
+            try
+            {
+                var dbContext = ApplicationContext.Current.DatabaseContext;
+                var colCount =
+                    dbContext.Database.ExecuteScalar<int>(
+                        "SELECT COUNT(1) FROM INFORMATION_SCHEMA.COLUMNS WHERE DATA_TYPE = 'nvarchar' AND COLUMN_NAME = 'value' AND CHARACTER_MAXIMUM_LENGTH = 2500 AND TABLE_NAME = 'cmsDataTypePreValues'");
+
+                // Check column
+                if (colCount != 0)
+                {
+                    using (var trans = dbContext.Database.GetTransaction())
+                    {
+                        // Change column
+                        dbContext.Database.Execute("ALTER TABLE [cmsDataTypePreValues] ALTER COLUMN [value] ntext NULL;");
+
+                        trans.Complete();
+                    }
+
+                    LogHelper.Debug(typeof(Application), "Successfully expanded Prevalue table Value column");
+                }
+                else
+                {
+                    LogHelper.Debug(typeof(Application), "Prevalue table Value column is already expanded");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error(typeof(Application), "Error expanding Prevalue table Value column", ex);
+            }
+        }
+    }
+}

app/Umbraco/DatabaseSizer/DatabaseSizer.csproj

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0114C963-C514-49C1-B7AB-DCB1825F498C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DatabaseSizer</RootNamespace>
+    <AssemblyName>DatabaseSizer</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="AutoMapper.Net4">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+    </Reference>
+    <Reference Include="businesslogic">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core">
+      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc">
+      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="cms">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+    </Reference>
+    <Reference Include="controls">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
+    </Reference>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="Examine">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack">
+      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor">
+      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor.Web">
+      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="interfaces">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.ApplicationBlocks.Data">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Helpers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler">
+      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLCE4Umbraco">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="TidyNet">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Core">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.DataLayer">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.editorControls">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.MacroEngines">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.providers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.XmlSerializers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
+    </Reference>
+    <Reference Include="UmbracoExamine">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
+    </Reference>
+    <Reference Include="UrlRewritingNet.UrlRewriter">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Application.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

app/Umbraco/DatabaseSizer/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DatabaseSizer.cs")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DatabaseSizer.cs")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("28dc35d2-3dfb-40b4-9093-bc47c91127ea")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

app/Umbraco/DatabaseSizer/app.config

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

app/Umbraco/DatabaseSizer/packages.config

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
+  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
+  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
+</packages>

app/Umbraco/Umbraco.Archetype.sln

@@ -0,0 +1,39 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Umbraco", "Umbraco.Archetype\Archetype.Umbraco.csproj", "{7D185D41-4228-4978-ACB8-83F9A48AD94F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4ED-85A6-484F-9E72-BE7AC9835821}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetype.Tests\Archetype.Tests.csproj", "{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseSizer", "DatabaseSizer\DatabaseSizer.csproj", "{0114C963-C514-49C1-B7AB-DCB1825F498C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs

@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System;
+using System.Linq;
+using System.Net;
+using System.Web.Http;
+using AutoMapper;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Editors;
+
+namespace Archetype.Api
+{
+    [PluginController("ArchetypeApi")]
+    public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
+    {
+
+        public IEnumerable<object> GetAllPropertyEditors()
+        {
+            return
+                global::Umbraco.Core.PropertyEditors.PropertyEditorResolver.Current.PropertyEditors
+                    .Select(x => new {defaultPreValues = x.DefaultPreValues, alias = x.Alias, view = x.ValueEditor.View});
+        }
+
+        public object GetAll() 
+        {
+            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
+            return dataTypes.Select(t => new { guid = t.Key, name = t.Name });
+        }
+
+        public object GetByGuid(Guid guid)
+        {
+            var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
+            if (dataType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues };
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Archetype</RootNamespace>
+    <AssemblyName>Archetype</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="AutoMapper.Net4">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="businesslogic">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core">
+      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc">
+      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="cms">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+    </Reference>
+    <Reference Include="controls">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
+    </Reference>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Examine">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack">
+      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ImageProcessor">
+      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor.Web">
+      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="interfaces">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.ApplicationBlocks.Data">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Helpers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="MiniProfiler">
+      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SQLCE4Umbraco">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="TidyNet">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Core">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.DataLayer">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.editorControls">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.MacroEngines">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.providers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="umbraco.XmlSerializers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
+    </Reference>
+    <Reference Include="UmbracoExamine">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
+    </Reference>
+    <Reference Include="UrlRewritingNet.UrlRewriter">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Api\ArchetypeDataTypeController.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="Events\ExpireCache.cs" />
+    <Compile Include="Extensions\ArchetypeHelper.cs" />
+    <Compile Include="Extensions\Extensions.cs" />
+    <Compile Include="Models\ArchetypeModel.cs" />
+    <Compile Include="Models\ArchetypePreValue.cs" />
+    <Compile Include="Models\ArchetypePreValueFieldset.cs" />
+    <Compile Include="Models\ArchetypePreValueProperty.cs" />
+    <Compile Include="Models\ArchetypeFieldsetModel.cs" />
+    <Compile Include="Models\ArchetypePropertyModel.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\VersionInfo.cs" />
+    <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
+    <Compile Include="Serialization\AsArchetypeAttribute.cs" />
+    <Compile Include="Serialization\ArchetypeJsonConverter.cs" />
+    <Compile Include="Serialization\AsFieldsetAttribute.cs" />
+    <Compile Include="Serialization\SerializationExtensions.cs" />
+    <Compile Include="PropertyEditors\ArchetypePropertyEditor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

app/Umbraco/Umbraco.Archetype/Constants.cs

@@ -0,0 +1,13 @@
+namespace Archetype
+{
+    public static class Constants
+    {
+        public const string PropertyEditorAlias = "Imulus.Archetype";
+
+        public const string PreValueAlias = "archetypeConfig";
+
+        public const string CacheKey_DataTypeByGuid = "";
+
+        public const string CacheKey_PreValueFromDataTypeId = "Archetype_GetArchetypePreValueFromDataTypeId_";
+    }
+}

app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web;
+
+namespace Archetype.Events
+{
+    public class ExpireCache : ApplicationEventHandler
+    {
+
+        protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            base.ApplicationStarting(umbracoApplication, applicationContext);
+            
+            DataTypeService.Saved += ExpirePreValueCache;
+        }
+
+        void ExpirePreValueCache(IDataTypeService sender, global::Umbraco.Core.Events.SaveEventArgs<IDataTypeDefinition> e)
+        {
+            foreach (var dataType in e.SavedEntities)
+            {
+                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_PreValueFromDataTypeId + dataType.Id);
+                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_DataTypeByGuid + dataType.Key);
+            }
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs

@@ -0,0 +1,153 @@
+using System;
+using System.Linq;
+using Archetype.Models;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Archetype.Extensions
+{
+    public class ArchetypeHelper
+    {
+
+        protected JsonSerializerSettings _jsonSettings;
+        protected ApplicationContext _app; 
+
+        internal ArchetypeHelper()
+        {
+            var dcr = new Newtonsoft.Json.Serialization.DefaultContractResolver();
+            dcr.DefaultMembersSearchFlags |= System.Reflection.BindingFlags.NonPublic;
+
+            _jsonSettings = new JsonSerializerSettings { ContractResolver = dcr };
+            _app = ApplicationContext.Current;
+        }
+
+        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
+        {
+            try
+            {
+                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
+
+                try
+                {
+                    // Get list of configured properties and their types and map them to the deserialized archetype model
+                    var preValue = GetArchetypePreValueFromPreValuesCollection(dataTypePreValues);
+                    RetrieveAdditionalProperties(ref archetype, preValue);
+                }
+                catch (Exception ex)
+                {
+                }
+
+                return archetype;
+            }
+            catch
+            {
+                return new Models.ArchetypeModel();
+            }         
+        }
+
+        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId, PublishedContentType hostContentType = null)
+        {
+            try
+            {
+                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
+
+                try
+                {
+                    // Get list of configured properties and their types and map them to the deserialized archetype model
+                    var preValue = GetArchetypePreValueFromDataTypeId(dataTypeId);
+                    RetrieveAdditionalProperties(ref archetype, preValue, hostContentType);
+                }
+                catch (Exception ex)
+                {
+                }
+
+                return archetype;
+            }
+            catch
+            {
+                return new Models.ArchetypeModel();
+            }
+        }
+
+         private ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)
+         {
+            return _app.ApplicationCache.RuntimeCache.GetCacheItem(
+                Constants.CacheKey_PreValueFromDataTypeId + dataTypeId,
+                () =>
+                {
+                    var preValues = _app.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId);
+
+                    var configJson = preValues.IsDictionaryBased
+                        ? preValues.PreValuesAsDictionary[Constants.PreValueAlias].Value
+                        : preValues.PreValuesAsArray.First().Value;
+
+                    var config = JsonConvert.DeserializeObject<ArchetypePreValue>(configJson, _jsonSettings);
+                    RetrieveAdditionalProperties(ref config);
+
+                    return config;
+
+                }) as ArchetypePreValue;
+        }  
+
+        private ArchetypePreValue GetArchetypePreValueFromPreValuesCollection(PreValueCollection dataTypePreValues)
+        {
+            var preValueAsString = dataTypePreValues.PreValuesAsDictionary.First().Value.Value;
+            var preValue = JsonConvert.DeserializeObject<ArchetypePreValue>(preValueAsString, _jsonSettings);
+            return preValue;
+        }
+
+
+        private IDataTypeDefinition GetDataTypeByGuid(Guid guid)
+        {
+            return (IDataTypeDefinition) ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
+                Constants.CacheKey_DataTypeByGuid + guid,
+                () => _app.Services.DataTypeService.GetDataTypeDefinitionById(guid));
+        }
+
+        /// <summary>
+        /// Retrieves additional metadata that isn't available on the stored model of an Archetype
+        /// </summary>
+        /// <param name="archetype">The Archetype to add the additional metadata to</param>
+        /// <param name="preValue">The configuration of the Archetype</param>
+        private void RetrieveAdditionalProperties(ref Models.ArchetypeModel archetype, ArchetypePreValue preValue, PublishedContentType hostContentType = null)
+        {
+            foreach (var fieldset in preValue.Fieldsets)
+            {
+                var fieldsetAlias = fieldset.Alias;
+                foreach (var fieldsetInst in archetype.Fieldsets.Where(x => x.Alias == fieldsetAlias))
+                {
+                    foreach (var property in fieldset.Properties)
+                    {
+                        var propertyAlias = property.Alias;
+                        foreach ( var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
+                        {
+                            propertyInst.DataTypeGuid = property.DataTypeGuid.ToString();
+                            propertyInst.DataTypeId = GetDataTypeByGuid(property.DataTypeGuid).Id;
+                            propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
+                            propertyInst.HostContentType = hostContentType;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves additional metadata that isn't available on the stored model of an ArchetypePreValue
+        /// </summary>
+        /// <param name="archetype">The Archetype to add the additional metadata to</param>
+        /// <param name="preValue">The configuration of the Archetype</param>
+        private void RetrieveAdditionalProperties(ref Models.ArchetypePreValue preValue)
+        {
+            foreach (var fieldset in preValue.Fieldsets)
+            {
+                foreach (var property in fieldset.Properties)
+                {
+                    property.PropertyEditorAlias = GetDataTypeByGuid(property.DataTypeGuid).PropertyEditorAlias;
+                }
+            }
+        }
+
+    }
+}

app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Web;
+using Archetype.Models;
+
+namespace Archetype.Extensions
+{
+    public static class Extensions
+    {
+        //lifted from the core as it is marked 'internal'
+        public static bool DetectIsJson(this string input)
+        {
+            input = input.Trim();
+            return input.StartsWith("{") && input.EndsWith("}")
+                   || input.StartsWith("[") && input.EndsWith("]");
+        }
+
+        public static bool IsArchetype(this ArchetypePropertyModel prop)
+        {
+            return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
+        }
+
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel)
+        {
+            return RenderPartials(htmlHelper, archetypeModel, null, null);
+        }
+
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath)
+        {
+            return RenderPartials(htmlHelper, archetypeModel, partialPath, null);
+        }
+
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, ViewDataDictionary viewDataDictionary)
+        {
+            return RenderPartials(htmlHelper, archetypeModel, null, viewDataDictionary);
+        }
+
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
+        {
+            return RenderPartials(htmlHelper, archetypeModel, partialPath, viewDataDictionary);
+        }
+
+        private static IHtmlString RenderPartials(HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
+        {
+            var context = HttpContext.Current;
+
+            if (archetypeModel == null || context == null)
+            {
+                return new HtmlString("");
+            }
+
+            var sb = new StringBuilder();
+            
+            var pathToPartials = "~/Views/Partials/Archetype/";
+            if (!string.IsNullOrEmpty(partialPath))
+            {
+                pathToPartials = partialPath;
+            }
+
+            foreach (var fieldsetModel in archetypeModel)
+            {
+                var partial = pathToPartials + fieldsetModel.Alias + ".cshtml";
+
+                if (System.IO.File.Exists(context.Server.MapPath(partial)))
+                {
+                    sb.AppendLine(htmlHelper.Partial(partial, fieldsetModel, viewDataDictionary).ToString());
+                }
+                else
+                {
+                    LogHelper.Info<ArchetypeModel>(string.Format("The partial for {0} could not be found.  Please create a partial with that name or rename your alias.", context.Server.MapPath(partial)));
+                }
+            }
+
+            return new HtmlString(sb.ToString());
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core;
+
+namespace Archetype.Models
+{
+    public class ArchetypeFieldsetModel
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("properties")]
+        public IEnumerable<ArchetypePropertyModel> Properties;
+
+        public ArchetypeFieldsetModel()
+        {
+            Properties = new List<ArchetypePropertyModel>();
+        }
+
+        #region Helper Methods
+
+        public string GetValue(string propertyAlias)
+        {
+            return GetValue<string>(propertyAlias);
+        }
+
+        public T GetValue<T>(string propertyAlias)
+        {
+            var property = GetProperty(propertyAlias);
+
+            if (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()))
+                return default(T);
+
+            return property.GetValue<T>();
+        }
+
+        public bool HasProperty(string propertyAlias)
+        {
+            return GetProperty(propertyAlias) != null;
+        }
+
+        public bool HasValue(string propertyAlias)
+        {
+            var property = GetProperty(propertyAlias);
+            if (property == null || property.Value == null)
+                return false;
+
+            return !string.IsNullOrEmpty(property.Value.ToString());
+        }
+
+        private ArchetypePropertyModel GetProperty(string propertyAlias)
+        {
+            return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
+        }
+
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,44 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Archetype.Models
+{
+    [JsonObject]
+    public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
+    {
+        [JsonProperty("fieldsets")]
+        internal IEnumerable<ArchetypeFieldsetModel> Fieldsets { get; set; }
+
+        public ArchetypeModel()
+        {
+            Fieldsets = new List<ArchetypeFieldsetModel>();
+        }
+
+        public IEnumerator<ArchetypeFieldsetModel> GetEnumerator()
+        {
+            return this.Fieldsets.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+
+        internal string SerializeForPersistence()
+        {
+            var json = JObject.Parse(JsonConvert.SerializeObject(this));
+            var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType" };
+
+            json.Descendants().OfType<JProperty>()
+              .Where(p => propertiesToRemove.Contains(p.Name))
+              .ToList()
+              .ForEach(x => x.Remove());
+
+            return json.ToString(Formatting.None);
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Archetype.Models
+{
+    public class ArchetypePreValue
+    {
+        [JsonProperty("showAdvancedOptions")]
+        public bool ShowAdvancedOptions { get; set; }
+
+        [JsonProperty("startWithAddButton")]
+        public bool StartWithAddButton { get; set; }
+
+        [JsonProperty("hideFieldsetToolbar")]
+        public bool HideFieldsetToolbar { get; set; }
+
+        [JsonProperty("enableMultipleFieldsets")]
+        public bool EnableMultipleFieldsets { get; set; }
+
+        [JsonProperty("enableCollapsing")]
+        public bool EnableCollapsing { get; set; }
+
+        [JsonProperty("hideFieldsetControls")]
+        public bool HideFieldsetControls { get; set; }
+
+        [JsonProperty("hidePropertyLabel")]
+        public bool HidePropertyLabel { get; set; }
+
+        [JsonProperty("maxFieldsets", NullValueHandling = NullValueHandling.Ignore)]
+        public int MaxFieldsets { get; set; }
+
+        [JsonProperty("fieldsets")]
+        public IEnumerable<ArchetypePreValueFieldset> Fieldsets { get; set; }
+
+        [JsonProperty("hidePropertyLabels")]
+        public bool HidePropertyLabels { get; set; }
+
+        [JsonProperty("customCssClass")]
+        public string CustomCssClass { get; set; }
+
+        [JsonProperty("customCssPath")]
+        public string CustomCssPath { get; set; }
+
+        [JsonProperty("customJsPath")]
+        public string CustomJsPath { get; set; }
+
+        [JsonProperty("developerMode")]
+        public bool DeveloperMode { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Archetype.Models
+{
+    public class ArchetypePreValueFieldset
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("remove")]
+        public bool Remove { get; set; }
+
+        [JsonProperty("collapse")]
+        public bool Collapse { get; set; }
+
+        [JsonProperty("labelTemplate")]
+        public string LabelTemplate { get; set; }
+
+        [JsonProperty("icon")]
+        public string Icon { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("properties")]
+        public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs

@@ -0,0 +1,38 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Archetype.Models
+{
+    public class ArchetypePreValueProperty
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("remove")]
+        public bool Remove { get; set; }
+
+        [JsonProperty("collapse")]
+        public bool Collapse { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("helpText")]
+        public string HelpText { get; set; }
+        
+        [JsonProperty("dataTypeGuid")]
+        public Guid DataTypeGuid { get; set; }
+
+        [JsonProperty("propertyEditorAlias")]
+        public string PropertyEditorAlias { get; set; }
+
+        [JsonProperty("value")]
+        public string Value { get; set; }
+
+        [JsonProperty("required")]
+        public bool Required { get; set; }
+
+        [JsonProperty("regEx")]
+        public string RegEx { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePropertyModel.cs

@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web;
+
+namespace Archetype.Models
+{
+    public class ArchetypePropertyModel {
+        [JsonProperty("alias")]
+        public string Alias { get; internal set; }
+
+        [JsonProperty("value")]
+        public object Value { get; internal set; }
+
+        [JsonProperty("propertyEditorAlias")]
+        public string PropertyEditorAlias { get; internal set; }
+
+        [JsonProperty("dataTypeId")]
+        public int DataTypeId { get; internal set; }
+
+        [JsonProperty("dataTypeGuid")]
+        internal string DataTypeGuid { get; set; }
+
+        [JsonProperty("hostContentType")]
+        internal PublishedContentType HostContentType { get; set; }
+
+        public T GetValue<T>()
+        {
+
+            // Try Umbraco's PropertyValueConverters
+            var converters = UmbracoContext.Current != null ? PropertyValueConvertersResolver.Current.Converters : Enumerable.Empty<IPropertyValueConverter>();
+            if (converters.Any())
+            {
+                var convertedAttempt = TryConvertWithPropertyValueConverters<T>(Value, converters);
+                if (convertedAttempt.Success)
+                    return convertedAttempt.Result;
+            }
+
+            // If the value is of type T, just return it
+            if (Value is T)
+                return (T)Value;
+
+            // No PropertyValueConverters matched, so try a regular type conversion
+            var convertAttempt2 = Value.TryConvertTo<T>();
+            if (convertAttempt2.Success)
+                return convertAttempt2.Result;
+
+            return default(T);
+        }
+
+        private Attempt<T> TryConvertWithPropertyValueConverters<T>(object value, IEnumerable<IPropertyValueConverter> converters)
+        {
+            var properyType = CreateDummyPropertyType(DataTypeId, PropertyEditorAlias);
+
+            // In umbraco, there are default value converters that try to convert the 
+            // value if all else fails. The problem is, they are also in the list of
+            // converters, and the means for filtering these out is internal, so
+            // we currently have to try ALL converters to see if they can convert
+            // rather than just finding the most appropreate. If the ability to filter
+            // out default value converters becomes public, the following logic could
+            // and probably should be changed.
+            foreach (var converter in converters.Where(x => x.IsConverter(properyType)))
+            {
+                // Convert the type using a found value converter
+                var value2 = converter.ConvertDataToSource(properyType, value, false);
+
+                // If the value is of type T, just return it
+                if (value2 is T)
+                    return Attempt<T>.Succeed((T)value2);
+
+                // Value is not final value type, so try a regular type conversion aswell
+                var convertAttempt = value2.TryConvertTo<T>();
+                if (convertAttempt.Success)
+                    return Attempt<T>.Succeed(convertAttempt.Result);
+            }
+
+            return Attempt<T>.Fail();
+        }
+
+        private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias)
+        {
+            return new PublishedPropertyType(this.HostContentType,
+                new PropertyType(new DataTypeDefinition(-1, propertyEditorAlias)
+                {
+                    Id = dataTypeId
+                }));
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Properties/AssemblyInfo.cs

@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Archetype")]
+[assembly: AssemblyDescription("Archetype's supporting code library for Umbraco")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Imulus")]
+[assembly: AssemblyProduct("Archetype")]
+[assembly: AssemblyCopyright("Copyright \xa9 Imulus 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+[assembly: Guid("E37E94F9-C7BA-4B54-B7E1-64419B3DBA0B")]
+
+[assembly: InternalsVisibleTo("Archetype.Courier")]
+[assembly: InternalsVisibleTo("Archetype.Tests")]

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

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

app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Extensions;
+using Archetype.Models;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Archetype.PropertyConverters
+{
+    [PropertyValueType(typeof(Models.ArchetypeModel))]
+    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    public class ArchetypeValueConverter : PropertyValueConverterBase
+    {
+
+        public ServiceContext Services
+        {
+            get { return ApplicationContext.Current.Services; }
+        }
+
+        public override bool IsConverter(PublishedPropertyType propertyType)
+        {
+            return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
+        }
+
+        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            var defaultValue = new Models.ArchetypeModel();
+
+            if (source == null)
+                return defaultValue;
+
+            var sourceString = source.ToString();
+
+            if (!sourceString.DetectIsJson())
+                return defaultValue;
+
+            var archetype = new ArchetypeHelper().DeserializeJsonToArchetype(source.ToString(),
+                (propertyType != null ? propertyType.DataTypeId : -1),
+                (propertyType != null ? propertyType.ContentType : null));
+
+            return archetype;
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Extensions;
+using ClientDependency.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors;
+using Umbraco.Core.Logging;
+
+namespace Archetype.PropertyEditors
+{
+	[PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")]
+	[PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")]
+	public class ArchetypePropertyEditor : PropertyEditor
+	{
+		#region Pre Value Editor
+
+		protected override PreValueEditor CreatePreValueEditor()
+		{
+			return new ArchetypePreValueEditor();
+		}
+
+		internal class ArchetypePreValueEditor : PreValueEditor
+		{
+			[PreValueField("archetypeConfig", "Config", "/App_Plugins/Archetype/views/archetype.config.html",
+				Description = "(Required) Describe your Archetype.")]
+			public string Config { get; set; }
+
+			[PreValueField("hideLabel", "Hide Label", "boolean",
+				Description = "Hide the Umbraco property title and description, making the Archetype span the entire page width")]
+			public bool HideLabel { get; set; }
+		}
+
+		#endregion
+
+		#region Value Editor
+
+		protected override PropertyValueEditor CreateValueEditor()
+		{
+			return new ArchetypePropertyValueEditor(base.CreateValueEditor());
+		}
+
+		internal class ArchetypePropertyValueEditor : PropertyValueEditorWrapper
+		{
+			protected JsonSerializerSettings _jsonSettings;
+
+			public ArchetypePropertyValueEditor(PropertyValueEditor wrapped)
+				: base(wrapped) { }
+
+			public override string ConvertDbToString(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+			{
+				if (property.Value == null || property.Value.ToString() == "")
+					return string.Empty;
+
+			    var archetype = new ArchetypeHelper().DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+					foreach (var propDef in fieldset.Properties)
+					{
+                        try
+                        {
+						    var dtd = dataTypeService.GetDataTypeDefinitionById(Guid.Parse(propDef.DataTypeGuid));
+						    var propType = new PropertyType(dtd) { Alias = propDef.Alias };
+						    var prop = new Property(propType, propDef.Value);
+						    var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+						    propDef.Value = propEditor.ValueEditor.ConvertDbToString(prop, propType, dataTypeService);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<ArchetypeHelper>(ex.Message, ex);
+                        }
+					}
+				}
+
+                return archetype.SerializeForPersistence();
+			}
+
+			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+			{
+				if (property.Value == null || property.Value.ToString() == "")
+					return string.Empty;
+
+			    var archetype = new ArchetypeHelper().DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+					foreach (var propDef in fieldset.Properties)
+					{
+                        try
+                        {
+                            var dtd = dataTypeService.GetDataTypeDefinitionById(Guid.Parse(propDef.DataTypeGuid));
+                            var propType = new PropertyType(dtd) { Alias = propDef.Alias };
+                            var prop = new Property(propType, propDef.Value);
+                            var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+                            propDef.Value = propEditor.ValueEditor.ConvertDbToEditor(prop, propType, dataTypeService);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<ArchetypeHelper>(ex.Message, ex);
+                        }
+					}
+				}
+
+				return archetype;
+			}
+            public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
+			{
+				if (editorValue.Value == null || editorValue.Value.ToString() == "")
+					return string.Empty;
+
+				var archetype = new ArchetypeHelper().DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+					foreach (var propDef in fieldset.Properties)
+					{
+                        try
+                        {
+						    var dtd = ApplicationContext.Current.Services.DataTypeService.GetDataTypeDefinitionById(Guid.Parse(propDef.DataTypeGuid));
+						    var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dtd.Id);
+						    var propData = new ContentPropertyData(propDef.Value, preValues, new Dictionary<string, object>());
+						    var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+						    propDef.Value = propEditor.ValueEditor.ConvertEditorToDb(propData, propDef.Value);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<ArchetypeHelper>(ex.Message, ex);
+                        }
+					}
+				}
+
+                return archetype.SerializeForPersistence();
+			}
+		}
+
+		#endregion	
+	}
+}

app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs

@@ -0,0 +1,354 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Archetype.Serialization
+{
+    public class ArchetypeJsonConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var models = GenerateModels(value);
+
+            if (models.Count < 1)
+                return;
+
+            if (models.Count == 1 && models[0] == null) 
+                return;
+
+            var jObj = new JObject
+            {
+                {
+                    "fieldsets", 
+                     new JArray( new JRaw(SerializeModels(models)))
+                }
+            };
+
+            writer.WriteRaw(ApplyFormatting(jObj.ToString(), writer.Formatting));
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var jToken = JToken.ReadFrom(reader);
+
+            if (jToken == null)
+                return null;
+
+            var obj = Activator.CreateInstance(objectType);
+
+            if (null != obj as IEnumerable<object>
+                && jToken["fieldsets"] != null && jToken["fieldsets"].Any())
+            {
+                return DeserializeEnumerableObject(obj, jToken);
+            }
+
+            return null == jToken as JArray 
+                        ? DeserializeObject(obj, jToken) 
+                        : PopulateProperties(obj, jToken);
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return IsValueArchetypeDatatype(objectType);
+        }
+
+        #region private methods
+
+        private string ApplyFormatting(string json, Formatting formatting)
+        {
+            return JToken.Parse(json).ToString(formatting);
+        }
+
+        private IList GenerateModels(object value)
+        {
+            var models = value as IList;
+
+            if (null != models)
+                return models;
+
+            var properties = GetSerialiazableProperties(value).ToList();
+
+            if (!PropertyLayoutHasFieldsets(properties))
+                return new List<object>() { value };
+
+            var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
+
+            foreach (var pInfo in properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)))
+            {
+                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
+            }
+
+            var fieldsetModels = properties.Where(HasAsFieldsetAttribute)
+                .Select(pInfo => pInfo.GetValue(value));
+
+            models = new List<object>
+            {
+                dynamicModel,                
+            };
+
+            models = ((IEnumerable<object>)models).Concat(fieldsetModels).ToList();
+
+            return models;
+        }
+
+        private object DeserializeEnumerableObject(object obj, JToken jToken)
+        {
+            var model = obj as IEnumerable<object>;
+
+            var itemType = model.GetType().BaseType.GetGenericArguments().First();
+            foreach (var fs in jToken["fieldsets"].Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
+            {
+                var item = JsonConvert.DeserializeObject(
+                    fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter());
+
+                obj.GetType().GetMethod("Add").Invoke(obj, new[] { item });
+            }
+
+            return obj;
+        }
+
+        private object DeserializeObject(object obj, JToken jToken)
+        {
+            var properties = GetSerialiazableProperties(obj).ToList();
+            var asFieldset = properties.Where(HasAsFieldsetAttribute).ToList();
+
+            foreach (var propInfo in asFieldset)
+            {
+                var propAlias = GetJsonPropertyName(propInfo);
+                var fsJToken = GetFieldsetProperties(propInfo.PropertyType, jToken);
+                var propJToken =
+                    fsJToken.Single(p => p.SelectToken("alias").ToString().Equals(propAlias));
+
+                if (propJToken == null)
+                    continue;
+
+                var propValue = IsValueArchetypeDatatype(propInfo.PropertyType)
+                ? JsonConvert.DeserializeObject(fsJToken.ToString(), propInfo.PropertyType,
+                    GetArchetypeDatatypeConverter())
+                : GetDeserializedPropertyValue(fsJToken, propInfo.PropertyType); ;
+
+                propInfo.SetValue(obj, propValue);
+            }
+
+            return PopulateProperties(obj, GetFieldsetProperties(obj.GetType(), jToken));
+        }
+
+        private JToken GetFieldsetProperties(Type objType, JToken jToken)
+        {
+            var objAlias = GetFieldsetName(objType);
+            return
+                jToken["fieldsets"].Single(p => p.SelectToken("alias").ToString().Equals(objAlias)).SelectToken("properties");
+        }
+
+        private object PopulateProperties(object obj, JToken jToken)
+        {
+            var properties = GetSerialiazableProperties(obj);
+
+            foreach (var propertyInfo in properties)
+            {
+                var propAlias = GetJsonPropertyName(propertyInfo);
+
+                var propJToken = jToken.SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(propAlias));
+
+                if (propJToken == null)
+                    continue;
+
+                var propValue = GetPropertyValue(propertyInfo, propJToken);
+
+                propertyInfo.SetValue(obj, propValue);
+            }
+
+            return obj;
+        }
+
+        private object GetPropertyValue(PropertyInfo propertyInfo, JToken propJToken)
+        {
+            return IsValueArchetypeDatatype(propertyInfo.PropertyType)
+                ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType,
+                    GetArchetypeDatatypeConverter())
+                : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
+        }
+
+        private bool PropertyLayoutHasFieldsets(IEnumerable<PropertyInfo> properties)
+        {
+            return properties.Any(HasAsFieldsetAttribute);
+        }
+
+        private static bool HasAsFieldsetAttribute(PropertyInfo pInfo)
+        {
+            return pInfo
+                .GetCustomAttributes(typeof(AsFieldsetAttribute), true).Length > 0;
+        }
+
+        private IEnumerable SerializeModels(IEnumerable models)
+        {
+            var fieldsetJson = (from object model in models where null != model select SerializeModel(model)).ToList();
+
+            return String.Join(",", fieldsetJson);
+        }
+
+        private string SerializeModel(object value)
+        {
+            if (value == null)
+                return null;
+
+            var jObj = IsExpandoObject(value) 
+                ? GetJObjectFromExpandoObject(value as IDictionary<string, object>) 
+                : GetJObject(value);
+
+            var fieldsetJson = new StringBuilder();
+            var fieldsetWriter = new StringWriter(fieldsetJson);
+
+            using (var jsonWriter = new JsonTextWriter(fieldsetWriter))
+            {
+                jObj.WriteTo(jsonWriter);
+            }
+
+            return fieldsetJson.ToString();
+        }
+
+        private bool IsExpandoObject(object value)
+        {
+            return value.GetType().Name.Equals(typeof (ExpandoObject).Name);
+        }
+
+        private JObject GetJObjectFromExpandoObject(IEnumerable<KeyValuePair<string, object>> obj)
+        {
+            var property = obj.ElementAt(0);
+            var alias = property.Key;
+            var value = property.Value;
+
+            var jObj = new JObject
+                {
+                    {
+                        "alias",
+                        new JValue(alias)
+                    }
+                };
+
+            var fsProperties = new List<JObject>
+            {
+                new JObject {new JProperty("alias", alias), new JProperty("value", value)}
+            };
+            jObj.Add("properties", new JRaw(JsonConvert.SerializeObject(fsProperties)));
+
+            return jObj;
+        }
+
+        private JObject GetJObject(object obj)
+        {
+            var jObj = new JObject
+                {
+                    {
+                        "alias",
+                        new JValue(GetFieldsetName(obj.GetType()))
+                    }
+                };
+
+            var properties = GetSerialiazableProperties(obj);
+
+            var fsProperties = new List<JObject>();
+
+            foreach (var propertyInfo in properties)
+            {
+                var fsProperty = new JObject();
+                var jProperty = new JProperty("alias", GetJsonPropertyName(propertyInfo));
+                fsProperty.Add(jProperty);
+
+                var propValue = propertyInfo.GetValue(obj, null);
+
+                fsProperty.Add(
+                    new JProperty("value",
+                                  IsValueArchetypeDatatype(propValue)
+                                      ? new JRaw(JsonConvert.SerializeObject(propValue,
+                                                                             GetArchetypeDatatypeConverter()))
+                                      : new JValue(GetSerializedPropertyValue(propValue))));
+
+                fsProperties.Add(fsProperty);
+            }
+
+            jObj.Add("properties", new JRaw(JsonConvert.SerializeObject(fsProperties)));
+
+            return jObj;
+        }
+
+        private IEnumerable<PropertyInfo> GetSerialiazableProperties(object obj)
+        {
+            return obj.GetType()
+                .GetProperties(BindingFlags.Instance | BindingFlags.Public)
+                .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute)));
+        }
+
+        private string GetJsonPropertyName(PropertyInfo property)
+        {
+            var attributes = property.GetCustomAttributes(true);
+            var jsonPropAttribute = (JsonPropertyAttribute)attributes.FirstOrDefault(attr => attr is JsonPropertyAttribute);
+
+            return jsonPropAttribute != null ? jsonPropAttribute.PropertyName : property.Name;
+        }
+
+        private string GetFieldsetName(Type type)
+        {
+            var attributes = type.GetCustomAttributes(true);
+            var archetypeDatatypeAttribute = (AsArchetypeAttribute)attributes.FirstOrDefault(attr => attr is AsArchetypeAttribute);
+
+            return archetypeDatatypeAttribute != null ? archetypeDatatypeAttribute.FieldsetName : type.Name;
+        }
+
+        private bool IsValueArchetypeDatatype(object value)
+        {
+            return value != null &&
+                IsValueArchetypeDatatype(value.GetType());
+        }
+
+        private bool IsValueArchetypeDatatype(Type type)
+        {
+            return type.GetCustomAttributes(typeof(AsArchetypeAttribute), true).Length > 0;
+        }
+
+        private JsonConverter GetArchetypeDatatypeConverter()
+        {
+            return (JsonConverter)Activator.CreateInstance(GetType());
+        }
+
+        private string GetSerializedPropertyValue(object propValue)
+        {
+            if (propValue == null)
+                return String.Empty;
+
+            if (propValue is bool)
+                return (bool)propValue ? GetSerializedPropertyValue(1) : GetSerializedPropertyValue(0);
+
+            return String.Format("{0}", propValue);
+        }
+
+        private object GetDeserializedPropertyValue(JToken jToken, Type type)
+        {            
+            if (String.IsNullOrEmpty(jToken.ToString()))
+                return GetDefault(type);
+
+            var localType = Nullable.GetUnderlyingType(type) ?? type;
+
+            if (localType == typeof(bool))
+                return jToken.ToString() == "1";
+
+            return localType == typeof(DateTime) 
+                ? Convert.ToDateTime(jToken.ToString())
+                : jToken.ToObject(localType);
+        }
+
+        private object GetDefault(Type type)
+        {
+            return type.IsValueType ? Activator.CreateInstance(type) : null;
+        }
+
+        #endregion
+    }
+}

app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Archetype.Serialization
+{
+    public class AsArchetypeAttribute : Attribute
+    {
+        public string FieldsetName { get; set; }
+
+        public AsArchetypeAttribute(string fieldsetname)
+        {
+            FieldsetName = fieldsetname;
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Archetype.Serialization
+{
+    public class AsFieldsetAttribute : Attribute
+    {
+    }
+}

app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Umbraco.Core.Models;
+using Umbraco.Web;
+
+namespace Archetype.Serialization
+{
+    public static class SerializationExtensions
+    {
+        //temporary
+        public static string GetPropertyDataValue(this IPublishedContent contentPage, string propertyAlias)
+        {
+            if (contentPage == null || !contentPage.HasProperty(propertyAlias))
+                return null;
+
+            return (string)contentPage.Properties.Single(p => p.PropertyTypeAlias == propertyAlias).DataValue;
+        }
+
+        public static T GetModelFromArchetype<T>(this IPublishedContent content,
+            string cmsFieldAlias, bool returnInstanceIfNull = false)
+            where T : class, new()
+        {
+            var archetypeJson = content.GetPropertyDataValue(cmsFieldAlias);
+            return JsonConvert.DeserializeObject<T>(archetypeJson) ??
+                   (returnInstanceIfNull ? Activator.CreateInstance<T>() : default(T));
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

app/Umbraco/Umbraco.Archetype/packages.config

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
+  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
+  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
+</packages>

app/controllers/config.controller.js

@@ -0,0 +1,294 @@
+angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource) {
+
+    //$scope.model.value = "";
+    //console.log($scope.model.value);
+
+    //define empty items
+    var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
+    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}';
+    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "fieldsets": [' + newFieldsetModel + ']}');
+
+    //ini the model
+    $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
+
+    //ini the render model
+    initConfigRenderModel();
+
+    //get the available datatypes
+    archetypePropertyEditorResource.getAllDataTypes().then(function(data) {
+        $scope.availableDataTypes = data;
+    });
+
+    //iconPicker
+    $scope.selectIcon = function(fieldset){
+        var dialog = dialogService.iconPicker({
+            callback: function(data){
+                fieldset.icon = data;
+            }
+        });
+    }
+
+    //config for the sorting
+    $scope.sortableOptions = {
+        axis: 'y',
+        cursor: "move",
+        handle: ".handle",
+        update: function (ev, ui) {
+
+        },
+        stop: function (ev, ui) {
+
+        }
+    };
+
+    //function that determines how to manage expanding/collapsing fieldsets
+    $scope.focusFieldset = function(fieldset){
+        var iniState;
+
+        if(fieldset)
+        {
+            iniState = fieldset.collapse;
+        }
+
+        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+            if($scope.archetypeConfigRenderModel.fieldsets.length == 1 && fieldset.remove == false)
+            {
+                fieldset.collapse = false;
+                return;
+            }
+
+            if(fieldset.label)
+            {
+                fieldset.collapse = true;
+            }
+            else
+            {
+                fieldset.collapse = false;
+            }
+        });
+
+        if(iniState)
+        {
+            fieldset.collapse = !iniState;
+        }
+    }
+
+    //ini the fieldsets
+    $scope.focusFieldset();
+
+    //function that determines how to manage expanding/collapsing properties
+    $scope.focusProperty = function(properties, property){
+        var iniState;
+
+        if(property)
+        {
+            iniState = property.collapse;
+        }
+
+        _.each(properties, function(property){
+            if(property.label)
+            {
+                property.collapse = true;
+            }
+            else
+            {
+                property.collapse = false;
+            }
+        });
+
+        if(iniState)
+        {
+            property.collapse = !iniState;
+        }
+    }
+
+    //ini the properties
+    _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+            $scope.focusProperty(fieldset.properties);
+    });
+
+    //setup JSON.stringify helpers
+    $scope.archetypeConfigRenderModel.toString = stringify;
+
+    //encapsulate stringify (should be built into browsers, not sure of IE support)
+    function stringify() {
+        return JSON.stringify(this);
+    }
+
+    //watch for changes
+    $scope.$watch('archetypeConfigRenderModel', function (v) {
+        //console.log(v);
+        if (typeof v === 'string') {
+            $scope.archetypeConfigRenderModel = JSON.parse(v);
+            $scope.archetypeConfigRenderModel.toString = stringify;
+        }
+    });
+
+    $scope.autoPopulateAlias = function(s) {
+        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
+        var modelProperty = s[modelType];
+
+        if (!modelProperty.aliasIsDirty) {
+            modelProperty.alias = modelProperty.label.toUmbracoAlias();
+        }
+    }
+
+    $scope.markAliasDirty = function(s) {
+        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
+        var modelProperty = s[modelType];
+
+        if (!modelProperty.aliasIsDirty) {
+            modelProperty.aliasIsDirty = true;;
+        }
+    }
+
+    //helper that returns if an item can be removed
+    $scope.canRemoveFieldset = function ()
+    {
+        return countVisibleFieldset() > 1;
+    }
+
+    //helper that returns if an item can be sorted
+    $scope.canSortFieldset = function ()
+    {
+        return countVisibleFieldset() > 1;
+    }
+
+    //helper that returns if an item can be removed
+    $scope.canRemoveProperty = function (fieldset)
+    {
+        return countVisibleProperty(fieldset) > 1;
+    }
+
+    //helper that returns if an item can be sorted
+    $scope.canSortProperty = function (fieldset)
+    {
+        return countVisibleProperty(fieldset) > 1;
+    }
+
+    $scope.getDataTypeNameByGuid = function (guid) {
+        if ($scope.availableDataTypes == null) // Might not be initialized yet?
+            return "";
+        
+        var dataType = _.find($scope.availableDataTypes, function(d) {
+            return d.guid == guid;
+        });
+
+        return dataType == null ? "" : dataType.name;
+    }
+
+    //helper to count what is visible
+    function countVisibleFieldset()
+    {
+        var count = 0;
+
+        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+            if (fieldset.remove == false) {
+                count++;
+            }
+        });
+
+        return count;
+    }
+
+    //determines how many properties are visible
+    function countVisibleProperty(fieldset)
+    {
+        var count = 0;
+
+        for (var i in fieldset.properties) {
+            if (fieldset.properties[i].remove == false) {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    //handles a fieldset add
+    $scope.addFieldsetRow = function ($index, $event) {
+        $scope.archetypeConfigRenderModel.fieldsets.splice($index + 1, 0, JSON.parse(newFieldsetModel));
+        $scope.focusFieldset();
+    }
+
+    //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting
+    $scope.removeFieldsetRow = function ($index) {
+        if ($scope.canRemoveFieldset()) {
+            if (confirm('Are you sure you want to remove this?')) {
+                $scope.archetypeConfigRenderModel.fieldsets[$index].remove = true;
+            }
+        }
+    }
+
+    //handles a property add
+    $scope.addPropertyRow = function (fieldset, $index) {
+        fieldset.properties.splice($index + 1, 0, JSON.parse(newPropertyModel));
+    }
+
+    //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting
+    $scope.removePropertyRow = function (fieldset, $index) {
+        if ($scope.canRemoveProperty(fieldset)) {
+            if (confirm('Are you sure you want to remove this?')) {
+                fieldset.properties[$index].remove = true;
+            }
+        }
+    }
+
+    //helper to ini the render model
+    function initConfigRenderModel()
+    {
+        $scope.archetypeConfigRenderModel = $scope.model.value;
+
+        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+
+            fieldset.remove = false;
+            if (fieldset.alias.length > 0)
+                fieldset.aliasIsDirty = true;
+
+            if(fieldset.label)
+            {
+                fieldset.collapse = true;
+            }
+
+            _.each(fieldset.properties, function(fieldset){
+                fieldset.remove = false;
+                if (fieldset.alias.length > 0)
+                    fieldset.aliasIsDirty = true;
+            });
+        });
+    }
+
+    //sync things up on save
+    $scope.$on("formSubmitting", function (ev, args) {
+        syncModelToRenderModel();
+    });
+
+    //helper to sync the model to the renderModel
+    function syncModelToRenderModel()
+    {
+        $scope.model.value = $scope.archetypeConfigRenderModel;
+        var fieldsets = [];
+
+        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+            //check fieldsets
+            if (!fieldset.remove) {
+                fieldsets.push(fieldset);
+
+                var properties = [];
+
+                _.each(fieldset.properties, function(property){
+                   if (!property.remove) {
+                        properties.push(property);
+                    }
+                });
+
+                fieldset.properties = properties;
+            }
+        });
+
+        $scope.model.value.fieldsets = fieldsets;
+    }
+
+    //archetype css
+    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
+});

app/controllers/controller.js

@@ -0,0 +1,286 @@
+angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, assetsService, angularHelper, notificationsService, $timeout) {
+
+    //$scope.model.value = "";
+    $scope.model.hideLabel = $scope.model.config.hideLabel == 1;
+
+    //get a reference to the current form
+    $scope.form = $scope.form || angularHelper.getCurrentForm($scope);
+
+    //set the config equal to our prevalue config
+    $scope.model.config = $scope.model.config.archetypeConfig;
+
+    //ini the model
+    $scope.model.value = $scope.model.value || getDefaultModel($scope.model.config);
+    init();
+
+    //helper to get $eval the labelTemplate
+    $scope.getFieldsetTitle = function(fieldsetConfigModel, fieldsetIndex) {
+        if(!fieldsetConfigModel)
+            return "";
+        var fieldset = $scope.model.value.fieldsets[fieldsetIndex];
+        var fieldsetConfig = $scope.getConfigFieldsetByAlias(fieldset.alias);
+        var template = fieldsetConfigModel.labelTemplate;
+
+        if (template.length < 1)
+            return fieldsetConfig.label;
+
+        var rgx = /{{(.*?)}}*/g;
+        var results;
+        var parsedTemplate = template;
+
+        while ((results = rgx.exec(template)) !== null) {
+            var propertyAlias = results[1];
+            var propertyValue = $scope.getPropertyValueByAlias(fieldset, propertyAlias);
+            parsedTemplate = parsedTemplate.replace(results[0], propertyValue);
+        }
+
+        return parsedTemplate;
+    };
+
+    //sort config
+    $scope.sortableOptions = {
+        axis: 'y',
+        cursor: "move",
+        handle: ".handle",
+        update: function (ev, ui) {
+            $scope.setDirty();
+        },
+        stop: function (ev, ui) {
+
+        }
+    };
+
+    //handles a fieldset add
+    $scope.addRow = function (fieldsetAlias, $index) {
+        if ($scope.canAdd())
+        {
+            if ($scope.model.config.fieldsets)
+            {
+                var newFieldset = getEmptyRenderFieldset($scope.getConfigFieldsetByAlias(fieldsetAlias));
+
+                if (typeof $index != 'undefined')
+                {
+                    $scope.model.value.fieldsets.splice($index + 1, 0, newFieldset);
+                }
+                else
+                {
+                    $scope.model.value.fieldsets.push(newFieldset);
+                }
+            }
+            $scope.setDirty();
+
+            newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+            $scope.focusFieldset(newFieldset);
+        }
+    }
+
+    $scope.removeRow = function ($index) {
+        if ($scope.canRemove()) {
+            if (confirm('Are you sure you want to remove this?')) {
+                $scope.setDirty();
+                $scope.model.value.fieldsets.splice($index, 1);
+            }
+        }
+    }
+
+    //helpers for determining if a user can do something
+    $scope.canAdd = function ()
+    {
+        if ($scope.model.config.maxFieldsets)
+        {
+            return countVisible() < $scope.model.config.maxFieldsets;
+        }
+
+        return true;
+    }
+
+    //helper that returns if an item can be removed
+    $scope.canRemove = function ()
+    {
+        return countVisible() > 1 
+            || ($scope.model.config.maxFieldsets == 1 && $scope.model.config.fieldsets.length > 1)
+            || $scope.model.config.startWithAddButton;
+    }
+
+    //helper that returns if an item can be sorted
+    $scope.canSort = function ()
+    {
+        return countVisible() > 1;
+    }
+
+    //helpers for determining if the add button should be shown
+    $scope.showAddButton = function () {
+        return $scope.model.config.startWithAddButton
+            && countVisible() === 0;
+            ///&& $scope.model.config.fieldsets.length == 1;
+    }
+
+    //helper, ini the render model from the server (model.value)
+    function init() {
+        $scope.model.value = removeNulls($scope.model.value);
+        addDefaultProperties($scope.model.value.fieldsets);
+    }
+
+    function addDefaultProperties(fieldsets)
+    {
+        _.each(fieldsets, function (fieldset)
+        {
+            fieldset.collapse = false;
+            fieldset.isValid = true;
+        });
+    }
+
+    //helper to get the correct fieldset from config
+    $scope.getConfigFieldsetByAlias = function(alias) {
+        return _.find($scope.model.config.fieldsets, function(fieldset){
+            return fieldset.alias == alias;
+        });
+    }
+
+    //helper to get a property by alias from a fieldset
+    $scope.getPropertyValueByAlias = function(fieldset, propertyAlias) {
+        var property = _.find(fieldset.properties, function(p) {
+            return p.alias == propertyAlias;
+        });
+        return (typeof property !== 'undefined') ? property.value : '';
+    };
+
+    $scope.isCollapsed = function(fieldset)
+    {
+        if(typeof fieldset.collapse === "undefined")
+        {
+            fieldset.collapse = true;
+        }
+        return fieldset.collapse;
+    }
+
+    //helper for expanding/collapsing fieldsets
+    $scope.focusFieldset = function(fieldset){
+        fixDisableSelection();
+
+        if (!$scope.model.config.enableCollapsing) {
+            return;
+        }
+
+        var iniState;
+
+        if(fieldset)
+        {
+            iniState = fieldset.collapse;
+        }
+
+        _.each($scope.model.value.fieldsets, function(fieldset){
+            fieldset.collapse = true;
+        });
+
+        if(!fieldset && $scope.model.value.fieldsets.length == 1)
+        {
+            $scope.model.value.fieldsets[0].collapse = false;
+            return;
+        }
+
+        if(iniState && fieldset)
+        {
+            fieldset.collapse = !iniState;
+        }
+    }
+
+    //ini the fieldset expand/collapse
+    $scope.focusFieldset();
+
+    //developerMode helpers
+    $scope.model.value.toString = stringify;
+
+    //encapsulate stringify (should be built into browsers, not sure of IE support)
+    function stringify() {
+        return JSON.stringify(this);
+    }
+
+    //watch for changes
+    $scope.$watch('model.value', function (v) {
+        if ($scope.model.config.developerMode) {
+            console.log(v);
+            if (typeof v === 'string') {
+                $scope.model.value = JSON.parse(v);
+                $scope.model.value.toString = stringify;
+            }
+        }
+    });
+
+    //helper to count what is visible
+    function countVisible()
+    {
+        return $scope.model.value.fieldsets.length;
+    }
+
+    // helper to get initial model if none was provided
+    function getDefaultModel(config) {
+        if (config.startWithAddButton)
+            return { fieldsets: [] };
+
+        return { fieldsets: [getEmptyRenderFieldset(config.fieldsets[0])] };
+    }
+
+    //helper to add an empty fieldset to the render model
+    function getEmptyRenderFieldset (fieldsetModel) {
+        return {alias: fieldsetModel.alias, collapse: false, isValid: true, properties: []};
+    }
+
+    //helper to ensure no nulls make it into the model
+    function removeNulls(model){
+        if(model.fieldsets){
+            _.each(model.fieldsets, function(fieldset, index){
+                if(!fieldset){
+                    model.fieldsets.splice(index, 1);
+                    removeNulls(model);
+                }
+            });
+
+            return model;
+        }
+    }
+
+    // Hack for U4-4281 / #61
+    function fixDisableSelection() {
+        $timeout(function() {
+            $('.archetypeEditor .controls')
+                .bind('mousedown.ui-disableSelection selectstart.ui-disableSelection', function(e) {
+                    e.stopImmediatePropagation();
+                });
+        }, 1000);
+    }
+
+    //helper to lookup validity when given a fieldsetIndex and property alias
+    $scope.getPropertyValidity = function(fieldsetIndex, alias)
+    {
+        if($scope.model.value.fieldsets[fieldsetIndex])
+        {
+            var property = _.find($scope.model.value.fieldsets[fieldsetIndex].properties, function(property){
+                return property.alias == alias;
+            });
+        }
+
+        return (typeof property == 'undefined') ? true : property.isValid;
+    }
+
+    // helper to force the current form into the dirty state
+    $scope.setDirty = function () {
+        if($scope.form) {
+            $scope.form.$setDirty();
+        }
+    }
+
+    //custom js
+    if ($scope.model.config.customJsPath) {
+        assetsService.loadJs($scope.model.config.customJsPath);
+    }
+
+    //archetype css
+    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
+
+    //custom css
+    if($scope.model.config.customCssPath)
+    {
+        assetsService.loadCss($scope.model.config.customCssPath);
+    }
+});

app/directives/archetypecustomview.js

@@ -0,0 +1,31 @@
+angular.module("umbraco.directives").directive('archetypeCustomView', function ($compile, $http) {
+    var linker = function (scope, element, attrs) {
+
+        var config = scope.archetype.config.archetypeConfig;
+
+        var view = "/App_plugins/Archetype/views/archetype.default.html";
+        if(config.customViewPath) {
+            view = config.customViewPath;
+        }
+
+        $http.get(view).then(function(data) {
+
+            scope.model = {};
+            scope.model.value = scope.archetype.value;
+            scope.model.config = scope.archetype.config;
+
+            element.html(data.data).show();
+
+            $compile(element.contents())(scope);
+        });
+    }
+
+    return {
+        restrict: "A",
+        replace: true,
+        link: linker,
+        scope: {
+            archetype: "="
+        }
+    }
+});

app/directives/archetypeproperty.js

@@ -0,0 +1,227 @@
+angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q) {
+
+    function getFieldsetByAlias(fieldsets, alias)
+    {
+        return _.find(fieldsets, function(fieldset){
+            return fieldset.alias == alias;
+        });
+    }
+
+    function getPropertyIndexByAlias(properties, alias){
+        for (var i in properties)
+        {
+            if (properties[i].alias == alias) {
+                return i;
+            }
+        }
+    }
+
+    function getPropertyByAlias(fieldset, alias){
+        return _.find(fieldset.properties, function(property){
+            return property.alias == alias; 
+        });
+    }
+
+    //helper that returns a JS ojbect from 'value' string or the original string
+    function jsonOrString(value, developerMode, debugLabel){
+        if(value && typeof value == 'string'){
+            try{
+                if(developerMode == '1'){
+                    console.log("Trying to parse " + debugLabel + ": " + value); 
+                }
+                value = JSON.parse(value);
+            }
+            catch(exception)
+            {
+                if(developerMode == '1'){
+                    console.log("Failed to parse " + debugLabel + "."); 
+                }
+            }
+        }
+
+        if(value && developerMode == '1'){
+            console.log(debugLabel + " post-parsing: ");
+            console.log(value); 
+        }
+
+        return value;
+    }
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var configFieldsetModel = getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
+        var view = "";
+        var label = configFieldsetModel.properties[scope.propertyConfigIndex].label;
+        var dataTypeGuid = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeGuid;
+        var config = null;
+        var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias;
+        var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value;
+        var umbracoPropertyAlias = scope.umbracoPropertyAlias;
+        // initialize container for invalid fieldset property identifiers (store on ngModelCtrl to separate Archetype validations, e.g. when there two Archetype properties on the same document)
+        if(ngModelCtrl.invalidProperties == null) {
+            ngModelCtrl.invalidProperties = [];
+        }
+
+        //try to convert the defaultValue to a JS object
+        defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue");
+
+        //grab info for the selected datatype, prepare for view
+        archetypePropertyEditorResource.getDataType(dataTypeGuid).then(function (data) {
+            //transform preValues array into object expected by propertyeditor views
+            var configObj = {};
+            _.each(data.preValues, function(p) {
+                configObj[p.key] = p.value;
+            });
+            config = configObj;
+
+            //determine the view to use [...] and load it
+            archetypePropertyEditorResource.getPropertyEditorMapping(data.selectedEditor).then(function(propertyEditor) {
+                var pathToView = umbPropEditorHelper.getViewPath(propertyEditor.view);
+
+                //load in the DefaultPreValues for the PropertyEditor, if any
+                var defaultConfigObj =  {};
+                if (propertyEditor.hasOwnProperty('defaultPreValues') && propertyEditor.defaultPreValues != null) {
+                    _.extend(defaultConfigObj, propertyEditor.defaultPreValues);
+                }
+
+                var mergedConfig = _.extend(defaultConfigObj, config);
+
+                loadView(pathToView, mergedConfig, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl, validateProperty);
+            });
+        });
+
+        scope.$on("formSubmitting", function (ev, args) {
+            // "hard" validate to highlight any erroneous entries
+            _.each(scope.fieldset.properties, function (property) {
+                validateProperty(scope.fieldset, property, true);
+            });
+        });
+
+        scope.$on("formSubmitted", function (ev, args) {
+            // reset the nested fieldset validation state after submit
+            ngModelCtrl.invalidProperties = [];
+        });
+
+        // need to pass the property fieldset here to clear any invalid state of the fieldset when validating a single fieldset property
+        // - it's the Umbraco way to hide the invalid state when altering an invalid property, even if the new value isn't valid either
+        function validateProperty(fieldset, property, markAsInvalid) {
+            var valid = true;
+            fieldset.isValid = true;
+            property.isValid = true;
+            var propertyConfig = getPropertyByAlias(configFieldsetModel, property.alias);
+            if (propertyConfig) {
+                // use property.value !== property.value to check for NaN values on numeric inputs
+                if (propertyConfig.required && (property.value == null || property.value === "" || property.value !== property.value)) {
+                    valid = false;
+                }
+                // issue 116: RegEx validate property value
+                // Only validate the property value if anything has been entered - RegEx is considered a supplement to "required".
+                if (valid == true && propertyConfig.regEx && property.value) {
+                    var regEx = new RegExp(propertyConfig.regEx);
+                    if (regEx.test(property.value) == false) {
+                        valid = false;
+                    }
+                }
+                // only mark the property as invalid when doing a "hard" validation
+                if (valid == false && markAsInvalid == true) {
+                    property.isValid = false;
+                }
+            }
+
+            // handle nested fieldset validation by storing the identifier of all invalid fieldset properties 
+            var fieldsetIdentifier = scope.umbracoPropertyAlias + "_" + scope.fieldsetIndex;
+            var propertyIdentifier = fieldsetIdentifier + "_" + property.alias;
+            var propertyIdentifierIndex = ngModelCtrl.invalidProperties.indexOf(propertyIdentifier);
+            if (valid == false) {
+                if (propertyIdentifierIndex == -1) {
+                    ngModelCtrl.invalidProperties.push(propertyIdentifier);
+                }
+            }
+            else {
+                if (propertyIdentifierIndex != -1) {
+                    ngModelCtrl.invalidProperties.splice(propertyIdentifierIndex, 1);
+                }
+            }
+            
+            if (markAsInvalid) {
+                // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
+                fieldset.isValid =
+                    _.find(ngModelCtrl.invalidProperties, function (item) {
+                        return item.indexOf(fieldsetIdentifier) == 0
+                    }) == null;
+            }
+
+            // set invalid state if one or more fieldsets contain invalid properties
+            ngModelCtrl.$setValidity('validation', ngModelCtrl.invalidProperties.length == 0);
+        }
+    }
+
+    function loadView(view, config, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl, validateProperty) {
+        if (view)
+        {
+            $http.get(view).success(function (data) {
+                if (data) {
+                    if (scope.archetypeConfig.developerMode == '1')
+                    {
+                        console.log(scope);
+                    }
+
+                    //define the initial model and config
+                    scope.form = scope.umbracoForm;
+                    scope.model = {};
+                    scope.model.config = {};
+
+                    //ini the property value after test to make sure a prop exists in the renderModel
+                    var renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
+
+                    if (!renderModelPropertyIndex)
+                    {
+                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties.push(JSON.parse('{"alias": "' + alias + '", "value": "' + defaultValue + '"}'));
+                        renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
+                    }
+                    scope.model.value = scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value;
+
+                    //set the config from the prevalues
+                    scope.model.config = config;
+
+                    //some items need an alias
+                    scope.model.alias = "archetype-property-" + umbracoPropertyAlias + "-" + scope.fieldsetIndex + "-" + scope.propertyConfigIndex;
+
+                    //watch for changes since there is no two-way binding with the local model.value
+                    scope.$watch('model.value', function (newValue, oldValue) {
+                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value = newValue;
+
+                        // call validation method for the property when the value changes 
+                        // use "soft" validation to mimic the default umbraco validation style (show error highlights on submit, not while entering data)
+                        validateProperty(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex], scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex], false);
+                    });
+
+                    element.html(data).show();
+                    $compile(element.contents())(scope);
+
+                    $timeout(function() {
+                        var def = $q.defer();
+                        def.resolve(true);
+                        $rootScope.$apply();
+                    }, 500);
+                }
+            });
+        }
+    }
+
+    return {
+        require: "^ngModel",
+        restrict: "E",
+        replace: true,
+        link: linker,
+        scope: {
+            property: '=',
+            propertyConfigIndex: '=',
+            archetypeConfig: '=',
+            fieldset: '=',
+            fieldsetIndex: '=',
+            archetypeRenderModel: '=',
+            umbracoPropertyAlias: '=',
+            umbracoForm: '='
+        }
+    }
+});

app/directives/localize.js

@@ -0,0 +1,21 @@
+angular.module("umbraco.directives").directive('archetypeLocalize', function (archetypeLocalizationService) {
+	var linker = function (scope, element, attrs){
+
+		var key = scope.key;
+        
+        archetypeLocalizationService.localize(key).then(function(value){
+        	if(value){
+        		element.html(value);
+        	}
+        });
+	}   
+
+	return {
+	    restrict: "E",
+	    rep1ace: true,
+	    link: linker,
+	    scope: {
+	    	key: '@'
+	    }
+	}
+});

app/langs/da-dk.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Skjul fieldsets?",
+	"hideFieldsetControlsDescription": "Skjuler kontrollerne tilføj/fjern/sortér.",
+	"toggleAdvanced": "Slå avancerede muligheder til/fra",
+	"toggleAdvancedDescription": "Vis avancerede muligheder.",
+	"hidePropertyLabels": "Skjul labels på egenskaber?",
+	"hidePropertyLabelsDescription": "Skjuler labels på egenskaber.",
+	"maxFieldsets": "Maks antal fieldsets",
+	"maxFieldsetsDescription": "Hvor mange fieldsets er tilladt? Hvis der skrives '1' vil deaktivere kontrollerne. Som standard er det ubegrænset.",
+	"enableMultipleFieldsets": "Aktivér flere Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Tillader flere typer af fieldsets i denne archetype.",
+	"hideFieldsetToolbar": "Skjul Fieldset værktøjslinie?",
+	"hideFieldsetToolbarDescription": "Skjuler den fieldset værktøjslinie der fremkommer når der findes mere end ét fieldset.",
+	"customWrapperClass": "Egen Wrapper Class",
+	"customWrapperClassDescription": "(Mulighed) Angiv din egen CSS class som tilføjes på wrapper div'en.",
+	"cssFile": "CSS fil",
+	"cssFileDescription": "(Mulighed) Tilføj en sti til din egen CSS fil der skal inkluderes på siden.",
+	"jsFile": "JavaScript fil",
+	"jsFileDescription": "(Mulighed) Tilføj en sti til din egen JavaScript fil der skal inkluderes på siden.",
+	"toggleDeveloperMode": "Slå udvikler muligheder til/fra.",
+	"toggleDeveloperModeDescription": "Aktivér på udvikler muligheder.",
+	"configModel": "Konfigurationsmodel",
+	"configModelDescription": "Vær forsigt med at redigere teksten for neden, den kontrollerer skemaet for denne archetype.",
+	"helpText": "Hjælpe tekst",
+	"defaultValue": "Standard værdi",
+	"dataType": "Datatype",
+	"required": "Påkrævet",
+	"regEx": "RegEx validering",
+	"properties": "Egenskaber",
+	"labelTemplate": "Label skabelon",
+	"select": "Vælg",
+	"icon": "Ikon"
+}

app/langs/de-de.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/en-gb.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias", 
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/en-us.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/es-es.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/fr-fr.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/he-il.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/it-it.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/ja-jp.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/ko-kr.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/nb-no.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/nl-nl.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/pl-pl.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/pt-br.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/ru-ru.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/sv-se.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/zh-cn.js

@@ -0,0 +1,35 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/less/archetype.less

@@ -0,0 +1,339 @@
+.archetypeEditor {
+    width: 98%;
+
+    .dropdown-menu {
+        top: auto;
+    }
+}
+
+.archetypeEditor fieldset{
+    border: 1px solid #dddddd;
+    padding: 0;
+    margin-bottom: 5px;
+    background-color: #f1f1f1;
+    clear: both;
+    display: inline-block;
+    width: 100%;
+}
+
+.archetypeEditor .archetypeFieldsetLabel {
+    position: relative;
+    width: 100%%;
+
+    .label-sub {
+        padding: 8px 0;
+        display: inline-block;
+        &.module-label {
+            width: 100%;
+        }
+    }
+
+    .dropdown-menu {
+        padding: 0;
+        border-radius: 0;
+        box-shadow: none;
+        margin-top: -10px;
+        margin-left: -200px;
+    }
+
+    span {
+        font-weight: bold;
+
+        &.menu-label { font-weight: normal; }
+    }
+
+    label:hover {
+        cursor: default;
+    }
+
+    &.enableCollapsing:hover {
+        cursor: pointer;
+
+        label  {
+            span {
+                text-decoration: underline;
+            }
+            &:hover {
+                cursor: pointer;
+            }
+        }
+    }
+
+    .caret {
+        margin: 8px 1px 0 15px;
+
+        &.caret-right {
+            border-bottom: 4px solid transparent;
+            border-top: 4px solid transparent;
+            border-left: 4px solid #000000;
+            content: "";
+            margin-top: 6px;
+        }
+    }
+
+    label{
+        margin-bottom: 0;
+        margin-left: 5px;
+        padding: 0;
+        span {
+            display: inline-block;
+        }
+    }
+}
+
+.archetypeEditor .archetypeCollapser{
+    clear: both;
+    height: 100%;
+    padding-top: 12px;
+    background-color: #fff;
+    border-top: 1px solid silver;
+    border-radius: 0 0 0 5px;
+}
+
+.archetypeEditor .multiPropertyTextbox{
+    margin-bottom: 3px;
+}
+
+.archetypeEditor ul{
+    list-style: none;
+    margin-left: 0;
+}
+
+.archetypeEditor,
+.archetypeConfig {
+    .archetypeEditorControls {
+        float: right;
+
+        i {
+            cursor: pointer;
+            &.handle {
+                cursor: move;
+            }
+        }
+    }
+}
+
+.archetypeEditor .archetypeEditorControls {
+    float: none;
+    position: absolute;
+    right: 15px;
+    top: 0;
+}
+
+.archetypeConfig .archetypeEditorControls {
+    float: right;
+}
+
+.archetypeEditor form {
+    margin-left:20px;
+
+    .control-label {
+        padding-top: 0 !important;
+    }
+}
+
+.archetypeEditor .archetypeProperty{
+    clear: both;
+    overflow: hidden;
+    margin-top: 3px;
+}
+
+.archetypeEditor .archetypeDeveloperModel
+{
+    font-family: monospace;
+    width: 98%;
+    min-height: 100px;
+    margin-bottom: 10px;
+    border: 1px solid red;
+}
+
+.archetypeEditor .archetypeFieldsetToolbar {
+    margin-bottom: 10px;
+    overflow: hidden;
+
+    li {
+        float: left;
+        padding: 2px 4px;
+        margin-right: 10px;
+        border: 1px solid #ddd;
+        cursor: pointer;
+    }
+}
+
+.archetypeEditor .archetypeFieldsetHeaderText{
+    clear:both;
+    margin-bottom: 3px;
+    font-size: 12px;
+}
+
+.archetypeEditor .archetypeFieldsetFooterText{
+    clear:both;
+    margin-bottom: 3px;
+    font-size: 12px;
+}
+
+.archetypeEditor .archetypeFieldsetHelpText{
+    clear:both;
+    margin-bottom: 3px;
+    font-size: 12px;
+}
+
+.archetypeConfig {
+    margin-bottom: 20px;
+}
+
+.archetypeConfig ul{
+    list-style: none;
+}
+
+.archetypeConfig li{
+    background-color: #fff;
+}
+
+.archetypeConfig label{
+    width: 120px;
+}
+
+.archetypeConfig .archetypeFieldsetWrapper{
+    border: 1px solid #ccc;
+    padding: 10px;
+    margin-bottom: 10px;
+}
+
+.archetypeConfig .archetypeFieldsetOption{
+    margin-bottom: 15px;
+    input[type=text]{
+        max-width: 300px;
+    }
+}
+
+.archetypeConfig .archetypeDeveloperModel {
+    font-family: monospace;
+    width: 88%;
+    margin: 5px 10px 10px;
+    height: 130px;
+}
+
+.archetypeConfig .archetypePropertiesWrapper {
+    border: 1px solid #ddd;
+    padding: 8px;
+    margin: -40px 10px 10px 140px;
+    max-width: 475px;
+
+    ul {
+        padding: 0;
+        margin: 0;
+    }
+
+    li {
+        padding: 10px;
+        margin-bottom: 10px;
+        background-color: #eee;
+
+        input[type=text] {
+            max-width: 190px;
+            width: auto;
+        }
+
+        select {
+            max-width: 160px;
+        }
+    }
+
+    li:last-child {
+        margin-bottom: 0;
+    }
+}
+
+.archetypeConfig .archetypeFieldsets {
+    margin-left: 0;
+}
+
+.archetypeConfig .archetypeFieldsetTitle {
+    cursor: pointer;
+    overflow: hidden;
+}
+
+.archetypeConfig .archetypeOptions label{
+    width: 400px;
+}
+
+.archetypeConfig .archetypeAdvancedOptions {
+    margin-top: 15px;
+    div {
+        margin-bottom: 10px;
+    }
+    label {
+        width: 400px;
+    }
+}
+
+.archetypeConfig .archetypeMaxFieldsets{
+    border: 1px solid #ddd;
+    width: 40px;
+    text-align: right;
+}
+
+.archetypeConfig .archetypePropertyTitle {
+    cursor: pointer;
+    overflow: hidden;
+}
+
+.archetypeConfig .archetypePropertyCollapser{
+    margin-top: 10px;
+    div {
+        margin-bottom: 10px;
+    }
+}
+
+.archetypeEditor .archetypeFieldsetError{
+    border: 1px solid #b94a48;
+}
+
+.archetypeEditor .archetypeProperty {
+    label {
+        span {
+            color: #343434;
+        }
+    }
+}
+.archetypeEditor .archetypePropertyError{
+    margin-bottom: 5px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+
+    label {
+
+        span {
+            color: #b94a48;
+            font-weight: bold;
+        }
+    }
+}
+
+.archetypeEditor .archetypeAddButton:hover {
+    text-decoration: none;
+
+    .archetypeAddButtonText {
+        text-decoration: underline;
+    }
+}
+
+.ui-sortable-placeholder {
+    visibility: visible !important;
+    background-color:   #d0e7f1 !important;
+}
+
+.archetypeConfig .archetypeFieldsetCollapser {
+    margin-top: 15px;
+}
+
+.archetypeConfig .fieldsetIcon {
+    margin-right: 10px;
+}
+
+.archetypeEditor .show-validation.ng-invalid .control-group.error .control-label {
+    span {
+        color: #343434;
+    }
+}

app/resources/propertyeditor.js

@@ -0,0 +1,29 @@
+angular.module('umbraco.resources').factory('archetypePropertyEditorResource', function($q, $http, umbRequestHelper){
+    return { 
+        getAllDataTypes: function() {
+            // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet
+            return umbRequestHelper.resourcePromise(
+                $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service'
+            );
+        },
+        getDataType: function(guid) {
+        	return umbRequestHelper.resourcePromise(
+        		$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid), 'Failed to retrieve datatype'
+    		);
+        },
+        getPropertyEditorMapping: function(alias) {
+            return umbRequestHelper.resourcePromise(
+                $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAllPropertyEditors"), 'Failed to retrieve datatype mappings'
+            ).then(function (data) {
+                var result = _.find(data, function(d) {
+                    return d.alias === alias;
+                });
+
+                if (result != null) 
+                    return result;
+
+                return "";
+            });
+        }
+    }
+}); 

app/services/localization.js

@@ -0,0 +1,42 @@
+angular.module('umbraco.services').factory('archetypeLocalizationService', function($http, $q, userService){
+    var service = {
+        resourceFileLoaded: false,
+        dictionary: {},
+        localize: function(key) {
+            var deferred = $q.defer();
+
+            if(service.resourceFileLoaded){
+                var value = service._lookup(key);
+                deferred.resolve(value);
+            }
+            else{
+                service.initLocalizedResources().then(function(dictionary){
+                   var value = service._lookup(key);
+                   deferred.resolve(value); 
+                });
+            } 
+
+            return deferred.promise;
+        },
+        _lookup: function(key){
+            return service.dictionary[key];
+        },
+        initLocalizedResources:function () {
+            var deferred = $q.defer();
+            userService.getCurrentUser().then(function(user){
+                $http.get("/App_plugins/Archetype/langs/" + user.locale + ".js") 
+                    .then(function(response){
+                        service.resourceFileLoaded = true;
+                        service.dictionary = response.data;
+
+                        return deferred.resolve(service.dictionary);
+                    }, function(err){
+                        return deferred.reject("Lang file missing");
+                    });
+            });
+            return deferred.promise;
+        }
+    }
+
+    return service;
+});

app/views/archetype.config.html

@@ -0,0 +1,141 @@
+<div class="archetypeConfig" ng-controller="Imulus.ArchetypeConfigController">
+    <ul class="archetypeFieldsets" ui-sortable="sortableOptions" ng-model="archetypeConfigRenderModel.fieldsets">
+        <li ng-repeat="fieldset in archetypeConfigRenderModel.fieldsets" ng-hide="fieldset.remove">
+            <div class="archetypeFieldsetWrapper" >
+                <div class="archetypeEditorControls" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
+                    <i class="icon icon-add" ng-click="addFieldsetRow($index, $event)"></i>
+                    <i class="icon icon-delete" ng-click="removeFieldsetRow($index)" ng-show="canRemoveFieldset()"></i>
+                    <i class="icon icon-navigation handle" ng-show="canSortFieldset()"></i>
+                </div>
+                <div class="archetypeFieldsetTitle" ng-click="focusFieldset(fieldset)">{{fieldset.label}}</div>
+                <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label">
+                    <div class="archetypeFieldsetOption">
+                        <label for="archetypeFieldLabel_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
+                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" on-keyup="autoPopulateAlias(this)" />
+                    </div>
+                    <div class="archetypeFieldsetOption">
+                        <label for="archetypeFieldAlias_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
+                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" on-keyup="markAliasDirty(this)" required/>
+                    </div>
+                    <div class="archetypeFieldsetOption">
+                        <label for="archetypeFieldLabelTemplate_{{$index}}"><archetype-localize key="labelTemplate">Label Template</archetype-localize></label>
+                        <input type="text" id="archetypeFieldLabelTemplate_{{$index}}" ng-model="fieldset.labelTemplate" />
+                    </div>
+                    <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
+                        <label for="archetypeFieldIcon_{{$index}}"><archetype-localize key="icon">Icon</archetype-localize></label>
+                        <i class="fieldsetIcon icon ng-class:fieldset.icon"></i><a ng-click="selectIcon(fieldset)"><archetype-localize key="select">Select</archetype-localize>…</a>
+                    </div>
+                    <div class="archetypeFieldsetOption">
+                        <label><archetype-localize key="properties">Properties</archetype-localize></label>
+                    </div>
+                    <div class="archetypePropertiesWrapper">
+                        <ul ui-sortable="sortableOptions" ng-model="fieldset.properties">
+                            <li ng-repeat="property in fieldset.properties" ng-hide="property.remove">
+                                <div class="archetypeEditorControls">
+                                    <i class="icon icon-add" ng-click="addPropertyRow(fieldset, $index)"></i>
+                                    <i class="icon icon-delete" ng-click="removePropertyRow(fieldset, $index)" ng-show="canRemoveProperty(fieldset)"></i>
+                                    <i class="icon icon-navigation handle" ng-show="canSortProperty(fieldset)"></i>
+                                </div>
+                                <div class="archetypePropertyTitle" ng-click="focusProperty(fieldset.properties, property)">
+                                    {{property.label}} ({{property.alias}}) - <span>{{getDataTypeNameByGuid(property.dataTypeGuid)}}</span>
+                                </div>
+                                <div class="archetypePropertyCollapser" ng-hide="property.collapse && property.label">
+                                    <div>
+                                        <label for="archetypePropertyLabel_{{$parent.$index}}_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" on-keyup="autoPopulateAlias(this)"/>
+                                    </div>
+                                    <div>
+                                        <label for="archetypePropertyAlias_{{$parent.$index}}_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" on-keyup="markAliasDirty(this)" required/>
+                                    </div>
+                                    <div>
+                                        <label for="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}"><archetype-localize key="helpText">Help Text</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}" ng-model="property.helpText" />
+                                    </div>
+                                    <div>
+                                        <label for="archetypePropertyDataType_{{$parent.$index}}_{{$index}}"><archetype-localize key="dataType">Datatype</archetype-localize></label>
+                                        <select id="archetypePropertyDataType_{{$parent.$index}}_{{$index}}" ng-model="property.dataTypeGuid" ng-options="datatype.guid as datatype.name for datatype in availableDataTypes | orderBy:'name'"></select>
+                                    </div>
+                                    <div>
+                                        <label for="archetypePropertyDefaultValue_{{$parent.$index}}_{{$index}}"><archetype-localize key="defaultValue">Default Value</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyDefaultValue_{{$parent.$index}}_{{$index}}" ng-model="property.value" />
+                                    </div>
+                                    <div>
+                                        <label for="archetypePropertyRequired_{{$parent.$index}}_{{$index}}"><archetype-localize key="required">Required</archetype-localize></label>
+                                        <input type="checkbox" id="archetypePropertyRequired_{{$parent.$index}}_{{$index}}" ng-model="property.required" />
+                                    </div>
+                                    <div>
+                                        <label for="archetypePropertyRegEx_{{$parent.$index}}_{{$index}}"><archetype-localize key="regEx">RegEx Validation</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyRegExValue_{{$parent.$index}}_{{$index}}" ng-model="property.regEx" />
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </li>
+    </ul>
+
+    <div class="archetypeOptions">
+        <div>
+            <label for="archetypeOptionsToggle"><archetype-localize key="toggleAdvanced">Toggle Advanced Options</archetype-localize><small><archetype-localize key="toggleAdvancedDescription">Show advanced options.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeOptionsToggle" ng-model="archetypeConfigRenderModel.showAdvancedOptions"/>
+        </div>
+    </div>
+
+    <div class="archetypeAdvancedOptions" ng-show="archetypeConfigRenderModel.showAdvancedOptions">
+        <div>
+            <label for="archetypeAdvancedOptionsStartWithAddButton"><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="archetypeConfigRenderModel.startWithAddButton"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsHideControls"><archetype-localize key="hideFieldsetControls">Hide Fieldset Controls?</archetype-localize><small><archetype-localize key="hideFieldsetControlsDescription">Hides the fieldset add/remove/sort controls.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsHideControls" ng-model="archetypeConfigRenderModel.hideFieldsetControls"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsHideLabels"><archetype-localize key="hidePropertyLabels">Hide Property Labels?</archetype-localize><small><archetype-localize key="hidePropertyLabelsDescription">Hides the property labels.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsHideLabels" ng-model="archetypeConfigRenderModel.hidePropertyLabels"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsMaxFieldsets"><archetype-localize key="maxFieldsets">Max Fieldsets</archetype-localize><small><archetype-localize key="maxFieldsetsDescription">How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</archetype-localize></small></label>
+            <input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="archetypeConfigRenderModel.maxFieldsets"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsMultipleFieldsets"><archetype-localize key="enableMultipleFieldsets">Enable Multiple Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleFieldsetsDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsMultipleFieldsets" ng-model="archetypeConfigRenderModel.enableMultipleFieldsets"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCollapsing"><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="archetypeConfigRenderModel.enableCollapsing"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsFieldsetToolbar"><archetype-localize key="hideFieldsetToolbar">Hide Fieldset Toolbar?</archetype-localize><small><archetype-localize key="hideFieldsetToolbarDescription">Hides the fieldset toolbar that appears when more than one fieldset model appears.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsFieldsetToolbar" ng-model="archetypeConfigRenderModel.hideFieldsetToolbar"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomClass"><archetype-localize key="customWrapperClass">Custom Wrapper Class</archetype-localize><small><archetype-localize key="customWrapperClassDescription">(Optional) Enter a custom CSS class that will be applied to the wrapper div.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomClass" ng-model="archetypeConfigRenderModel.customCssClass"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomCss"><archetype-localize key="cssFile">CSS File</archetype-localize><small><archetype-localize key="cssFileDescription">(Optional) Enter a path for a custom CSS file to be included on the page.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomCss" ng-model="archetypeConfigRenderModel.customCssPath"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomJs"><archetype-localize key="jsFile">JS File</archetype-localize><small><archetype-localize key="jsFileDescription">(Optional) Enter a path for a custom JS file to be included on the page.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomJs" ng-model="archetypeConfigRenderModel.customJsPath"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomView"><archetype-localize key="viewFile">View File</archetype-localize><small><archetype-localize key="viewFileDescription">(Optional) Enter a path for a custom view file to be used to render this Archetype.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomView" ng-model="archetypeConfigRenderModel.customViewPath"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsDeveloperMode"><archetype-localize key="toggleDeveloperMode">Toggle Developer Mode</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="archetypeConfigRenderModel.developerMode"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this archetype.</archetype-localize></small></label>
+            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="archetypeConfigRenderModel"></textarea>
+        </div>
+    </div>
+</div>

app/views/archetype.default.html

@@ -0,0 +1,62 @@
+<div class="archetypeEditor ng-class:model.config.customCssClass" ng-controller="Imulus.ArchetypeController">
+    <textarea class="archetypeDeveloperModel" ng-show="model.config.developerMode" ng-model="model.value"></textarea>
+    <ul ui-sortable="sortableOptions" ng-model="model.value.fieldsets" ng-show="!showAddButton()">
+        <li ng-repeat="fieldset in model.value.fieldsets">
+            <fieldset ng-class="[fieldset.alias, (!fieldset.isValid ? 'archetypeFieldsetError' : '')]" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
+                <div class="archetypeFieldsetLabel" ng-class="{enableCollapsing: model.config.enableCollapsing}">
+                    <div ng-click="focusFieldset(fieldset)" class="label-sub module-label">
+                        <span class="caret" ng-hide="fieldset.collapse || !model.config.enableCollapsing"></span>
+                        <span class="caret caret-right" ng-show="fieldset.collapse && model.config.enableCollapsing"></span>
+                        <label>
+                            <i class="fieldsetIcon icon ng-class:fieldsetConfigModel.icon"></i>
+                            <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
+                        </label>
+                    </div>
+                    <div class="archetypeEditorControls label-sub" ng-hide="model.config.hideFieldsetControls">
+                        <i class="icon icon-add dropdown-toggle" ng-show="canAdd()" data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(fieldset.alias, $index) : return"></i>
+                        <ul class="dropdown-menu umb-actions">
+                            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, $parent.$index)">
+                                <a>
+                                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
+                                    <span class="menu-label">{{fieldsetModel.label}}</span>
+                                </a>
+                            </li>
+                        </ul>
+                        <i class="icon icon-remove" ng-click="removeRow($index)" ng-show="canRemove()"></i>
+                        <i class="icon icon-navigation handle" ng-show="canSort()"></i>
+                    </div>
+                </div>
+                <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
+                    <form class="form-inline">
+                        <div ng-class="[property.alias, (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
+                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-{{$parent.$index}}-{{$index}}">
+                                <span>{{property.label}}</span>
+                                <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
+                                    <small>{{property.helpText}}</small>
+                                </div>
+                            </label>
+
+                            <div class="controls">
+                                <archetype-property class="archetypeEditor" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-property-alias="model.alias" umbraco-form = "form"></archetype-property>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </fieldset>
+        </li>
+    </ul>
+    <div ng-show="showAddButton()">
+        <a data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(model.config.fieldsets[0].alias, 0) : return" prevent-default>
+            <i class="icon icon-add dropdown-toggle"></i>
+            <localize key="general_add" class="archetypeAddButtonText">Add</localize>
+        </a>
+        <ul class="dropdown-menu umb-actions">
+            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, 0)">
+                <a>
+                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
+                    <span class="menu-label">{{fieldsetModel.label}}</span>
+                </a>
+            </li>
+        </ul>
+    </div>
+</div>

app/views/archetype.html

@@ -0,0 +1 @@
+<div archetype-custom-view archetype="model"></div>

config/meta.json

@@ -0,0 +1,9 @@
+{
+	"name": "Archetype",
+	"version": "1.2-beta",
+	"url": "http://github.com/imulus/archetype/",
+	"author": "Imulus",
+	"authorUrl": "http://imulus.com/",
+	"license": "MIT",
+	"licenseUrl": "http://opensource.org/licenses/MIT"
+}

config/package.nuspec

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+        <metadata>
+                <id>Archetype</id>
+                <version><%= version %></version>
+                <title><%= name %></title>
+                <authors>imulus, kgiszewski, tomfulton</authors>
+                <owners>imulus, kgiszewski, tomfulton</owners>
+                <projectUrl>http://github.com/imulus/archetype</projectUrl>
+                <description><![CDATA[Archetype for Umbraco]]></description>
+                <tags>umbraco</tags>
+                <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
+                <licenseUrl><%= licenseUrl %></licenseUrl>
+        </metadata>
+</package>

config/package.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<umbPackage>
+  <info>
+    <package>
+      <name><%= name %></name>
+      <version><%= version %></version>
+      <license url="<%= licenseUrl %>"><%= license %></license>
+      <url><%= url %></url>
+      <requirements>
+        <major>0</major>
+        <minor>0</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name><%= author %></name>
+      <website><%= authorUrl %></website>
+    </author>
+    <readme><![CDATA[<%= readmeContents %>]]></readme>
+  </info>
+  <DocumentTypes />
+  <Templates />
+  <Stylesheets />
+  <Macros />
+  <DictionaryItems />
+  <Languages />
+  <DataTypes />
+  <control />
+  <Actions />
+  <files>
+  	<% files.forEach(function(file) { %>
+  	<file>
+      <guid><%= file.guid %>.<%= file.ext %></guid>
+      <orgPath><%= file.dir %></orgPath>
+      <orgName><%= file.name %></orgName>
+    </file>
+	<% }); %>
+  </files>
+</umbPackage>

index.html

@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-  <head>
-    <meta charset='utf-8' />
-    <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-    <meta name="description" content="Archetype : An Umbraco 7 Property Editor Wrapper" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
-
-    <title>Archetype</title>
-  </head>
-
-  <body>
-
-    <!-- HEADER -->
-    <div id="header_wrap" class="outer">
-        <header class="inner">
-          <img class="logo" src="images/logo.png" alt="logo"/>
-          <a id="forkme_banner" href="https://github.com/imulus/Archetype">View on GitHub</a>
-
-          <h1 id="project_title">Archetype</h1>
-          <h2 id="project_tagline">An Umbraco 7 Property Editor Wrapper</h2>
-
-            <section id="downloads">
-              <a class="zip_download_link" href="https://github.com/imulus/Archetype/zipball/master">Download this project as a .zip file</a>
-              <a class="tar_download_link" href="https://github.com/imulus/Archetype/tarball/master">Download this project as a tar.gz file</a>
-            </section>
-        </header>
-    </div>
-
-    <!-- MAIN CONTENT -->
-    <div id="main_content_wrap" class="outer">
-      <section id="main_content" class="inner">
-        <p>Archetype is an Umbraco 7 property editor that wraps other installed property editors.  By wrapping the other properties, Archetype allows for custom and repeatable fieldset mashups.</p>
-
-<p>Checkout some videos of Archetype in action here: <a href="http://blog.imulus.com/kevin-giszewski/umbraco-7-package-preview-archetype">http://blog.imulus.com/kevin-giszewski/umbraco-7-package-preview-archetype</a></p>
-<img class="logo" style="border: 1px solid #ccc;" src="images/example1.png"/>
-<h2>
-<a name="installation" class="anchor" href="#installation"><span class="octicon octicon-link"></span></a>Installation</h2>
-
-<p>Install the latest <a href="https://github.com/imulus/Archetype/releases">package</a> through the Umbraco package installer or via <a href="http://www.nuget.org/packages/Archetype/">NuGet</a>.</p>
-
-<h2>
-<a name="basic-configuration" class="anchor" href="#basic-configuration"><span class="octicon octicon-link"></span></a>Basic Configuration</h2>
-
-<p>After installation, visit the developer section and create a new data type with ‘Archetype’ as the selected property editor.</p>
-
-<p>At this point you should now see several input boxes to set up your Archetype fieldset:</p>
-
-<p><strong>Label</strong> - A label for your fieldset (i.e. person, car, etc)</p>
-
-<p><strong>Alias (required)</strong> - Pick a machine safe (A-Z 0-9 _- no spaces) name for your archetype that will be used for tracking this fieldset.</p>
-
-<p><strong>Label Template</strong></p>
-
-<p>This template will be used in the data editor and will display when the fieldset is collapsed.  Ideally you can select static text or a property alias.  If you choose to use a property value, you must use the following syntax:</p>
-
-<p><code>{{firstName}}</code> - Where ‘firstName’ is the alias of a property.</p>
-
-<p><strong>Tooltip</strong> - Appears when hovering overing over a fieldset in the data editor.  This is only applicable when multiple fieldsets are enabled.</p>
-
-<p><strong>Properties</strong> - Properties represent the actual input controls that your Archetype will encapsulate.</p>
-
-<ul>
-<li><p><em>Label</em> - A label for your property.</p></li>
-<li><p><em>Alias</em> (required) - Pick a machine safe (A-Z 0-9 _- no spaces) name for your archetype that will be used for tracking this property.</p></li>
-<li><p><em>Help Text</em> - Text that appears under the label to guide the user on what the input is for.</p></li>
-<li><p><em>Datatype</em> - Select the preconfigured Umbraco data type.</p></li>
-<li><p><em>Default Value</em> - Input either a JSON or plain text value.  This value varies and is determined by the chosen view.</p></li>
-<li><p><em>Required</em> - Simple required validation can be achieved by ticking this box.</p></li>
-</ul><h2>
-<a name="advanced-configuration" class="anchor" href="#advanced-configuration"><span class="octicon octicon-link"></span></a>Advanced Configuration</h2>
-
-<p>Advanced options can be exposed by ticking the ‘Toggle Advanced Options’ box.</p>
-
-<p><strong>Max Fieldsets</strong> - When blank, the Archetype will allow an infinite number of repeated fieldsets.  Placing an integer in this box will limit the number to the amount entered.</p>
-
-<p><strong>Enable Multiple Fieldsets</strong> - By ticking this box, a developer may add more than one type of fieldset to the Archetype.  When there are multiple fieldsets configured, a toolbar will display on the data editor to allow the editor to select the different fieldsets.</p>
-
-<p><strong>Custom Wrapper Class</strong> - If you need to inject a custom class to your Archetype wrapper, this is the place to do it.</p>
-
-<p><strong>CSS File</strong> - If you would like to alter the appearance of the default Archetype styles, simply include a file path to your CSS file here.</p>
-
-<p><strong>JS File</strong> - If you would like to inject some JavaScript on the page, simply include a file path to your JS file here.</p>
-
-<p><strong>Toggle Developer Mode</strong> - Tick this box to enable verbose debugging to the console.  This also expose the data model on the data editor page which can be live edited.</p>
-
-<p><strong>Config Model</strong> - Import/Export your Archetype between installs by copy/pasting this code.  You can also live edit your Archetype config by alter these values.  Caution should be used when doing so.</p>
-
-<h2>
-<a name="usage" class="anchor" href="#usage"><span class="octicon octicon-link"></span></a>Usage</h2>
-
-<p>To use your new Archetype, simply add it to any document type.</p>
-
-<p>To integrate your own property editor:</p>
-
-<ol>
-<li>Ensure your property editor is installed into Umbraco.</li>
-<li>Edit the <code>/App_Plugins/Archetype/js/propertyEditors.views.js</code> file.</li>
-<li>Add a JSON object that defines your custom property editor.</li>
-</ol>
-
-<p>How to use it on a template you ask?:  <a href="https://gist.github.com/kgiszewski/8863822">Get the gist here.</a></p>
-
-<h2>
-<a name="known-issues" class="anchor" href="#known-issues"><span class="octicon octicon-link"></span></a>Known Issues</h2>
-
-<h3>
-<a name="umbraco-caching" class="anchor" href="#umbraco-caching"><span class="octicon octicon-link"></span></a>Umbraco Caching</h3>
-
-<p>If you decide to extend this project locally, you'll want to set the <code>&lt;compilation&gt;</code> debug property in your web.config to <code>true</code>:</p>
-
-<p><code>&lt;compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.5"&gt;</code></p>
-
-<p>This is in order to circumvent the minification and caching of the JavaScript files.</p>
-
-<h3>
-<a name="prevalue-character-limit" class="anchor" href="#prevalue-character-limit"><span class="octicon octicon-link"></span></a>Prevalue Character Limit</h3>
-
-<p>If you get an error during saving that says the value will be truncated in the database, it is because you config has exceeded the 2500 character limit imposed by Umbraco.  You can get around this by upping the limit in your DB.  Please backup your DB first.</p>
-
-<p><a href="http://issues.umbraco.org/issue/U4-2120">http://issues.umbraco.org/issue/U4-2120</a></p>
-
-<h3>
-<a name="other-issues" class="anchor" href="#other-issues"><span class="octicon octicon-link"></span></a>Other Issues</h3>
-
-<p>There is also a list <a href='https://github.com/imulus/Archetype/issues'>here</a>.</p>
-      </section>
-    </div>
-
-    <!-- FOOTER  -->
-    <div id="footer_wrap" class="outer">
-      <footer class="inner">
-        <p class="copyright">Archetype maintained by <a href="https://github.com/imulus">imulus</a></p>
-        <p>Published with <a href="http://pages.github.com">GitHub Pages</a></p>
-      </footer>
-    </div>
-
-    
-
-  </body>
-</html>

javascripts/main.js

@@ -1 +0,0 @@
-console.log('This would be the main JS file.');

package.json

@@ -0,0 +1,34 @@
+{
+  "name": "archetype",
+  "version": "0.0.0",
+  "dependencies": {
+    "grunt": "~0.4.2",
+    "bower": "~1.2.8",
+    "grunt-contrib-copy": "~0.5.0",
+    "grunt-contrib-less": "~0.8.3",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-uglify": "~0.2.7",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-jshint": "~0.7.2",
+    "grunt-cli": "~0.1.11",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-touch": "~0.1.0",
+    "guid": "0.0.12",
+    "adm-zip": "~0.4.3",
+    "rimraf": "~2.2.5",
+    "grunt-nuget": "~0.1.1",
+    "grunt-template": "~0.2.2",
+    "fs-extra": "~0.8.1",
+    "grunt-msbuild": "~0.1.9",
+    "grunt-dotnet-assembly-info": "~1.0.9",
+    "load-grunt-tasks": "~0.4.0",
+    "grunt-umbraco-package": "0.0.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/imulus/Archetype.git"
+  },
+  "devDependencies": {
+    "grunt-msbuild": "^0.1.12"
+  }
+}

params.json

@@ -1 +0,0 @@
-{"name":"Archetype","tagline":"An Umbraco 7 Property Editor Wrapper","body":"Archetype is an Umbraco 7 property editor that wraps other installed property editors.  By wrapping the other properties, Archetype allows for custom and repeatable fieldset mashups.\r\n\r\nCheckout some videos of Archetype in action here: http://blog.imulus.com/kevin-giszewski/umbraco-7-package-preview-archetype\r\n\r\n##Installation\r\n\r\nInstall the [package](https://github.com/imulus/Archetype/releases) through the Umbraco package installer or via [NuGet](http://www.nuget.org/packages/Archetype/).\r\n\r\n##Basic Configuration##\r\n\r\nAfter installation, visit the developer section and create a new data type with ‘Archetype’ as the selected property editor.\r\n\r\nAt this point you should now see several input boxes to set up your Archetype fieldset:\r\n\r\n**Label** - A label for your fieldset (i.e. person, car, etc)\r\n\r\n**Alias (required)** - Pick a machine safe (A-Z 0-9 _- no spaces) name for your archetype that will be used for tracking this fieldset.\r\n\r\n**Label Template**\r\n\r\nThis template will be used in the data editor and will display when the fieldset is collapsed.  Ideally you can select static text or a property alias.  If you choose to use a property value, you must use the following syntax:\r\n\r\n`{{firstName}}` - Where ‘firstName’ is the alias of a property.\r\n\r\n**Tooltip** - Appears when hovering overing over a fieldset in the data editor.  This is only applicable when multiple fieldsets are enabled.\r\n\r\n**Properties** - Properties represent the actual input controls that your Archetype will encapsulate.\r\n\t\r\n* _Label_ - A label for your property.\r\n\t\r\n* _Alias_ (required) - Pick a machine safe (A-Z 0-9 _- no spaces) name for your archetype that will be used for tracking this property.\r\n\r\n* _Help Text_ - Text that appears under the label to guide the user on what the input is for.\r\n\r\n* _Datatype_ - Select the preconfigured Umbraco data type.\r\n\r\n* _Default Value_ - Input either a JSON or plain text value.  This value varies and is determined by the chosen view.\r\n\r\n* _Required_ - Simple required validation can be achieved by ticking this box.\r\n\r\n## Advanced Configuration\r\n\r\nAdvanced options can be exposed by ticking the ‘Toggle Advanced Options’ box.\r\n\r\n**Max Fieldsets** - When blank, the Archetype will allow an infinite number of repeated fieldsets.  Placing an integer in this box will limit the number to the amount entered.\r\n\r\n**Enable Multiple Fieldsets** - By ticking this box, a developer may add more than one type of fieldset to the Archetype.  When there are multiple fieldsets configured, a toolbar will display on the data editor to allow the editor to select the different fieldsets.\r\n\r\n**Custom Wrapper Class** - If you need to inject a custom class to your Archetype wrapper, this is the place to do it.\r\n\r\n**CSS File** - If you would like to alter the appearance of the default Archetype styles, simply include a file path to your CSS file here.\r\n\r\n**JS File** - If you would like to inject some JavaScript on the page, simply include a file path to your JS file here.\r\n\r\n**Toggle Developer Mode** - Tick this box to enable verbose debugging to the console.  This also expose the data model on the data editor page which can be live edited.\r\n\r\n**Config Model** - Import/Export your Archetype between installs by copy/pasting this code.  You can also live edit your Archetype config by alter these values.  Caution should be used when doing so.\r\n\r\n## Usage\r\n\r\nTo use your new Archetype, simply add it to any document type.\r\n\r\nTo integrate your own property editor:\r\n\r\n1. Ensure your property editor is installed into Umbraco.\r\n2. Edit the `/App_Plugins/Archetype/js/propertyEditors.views.js` file.\r\n3. Add a JSON object that defines your custom property editor.\r\n\r\n## Known Issues\r\n\r\n### Umbraco Caching\r\n\r\nIf you decide to extend this project locally, you'll want to set the `<compilation>` debug property in your web.config to `true`:\r\n\r\n`<compilation defaultLanguage=\"c#\" debug=\"true\" batch=\"false\" targetFramework=\"4.5\">`\r\n\r\nThis is in order to circumvent the minification and caching of the JavaScript files.\r\n\r\n### Prevalue Character Limit\r\n\r\nIf you get an error during saving that says the value will be truncated in the database, it is because you config has exceeded the 2500 character limit imposed by Umbraco.  You can get around this by upping the limit in your DB.  Please backup your DB first.\r\n\r\nhttp://issues.umbraco.org/issue/U4-2120\r\n\r\n### Core Property Editors\r\nRTE - The RTE doesn’t like to render on a repeatable fieldset.  It also goes bonkers when you try to sort a field.","google":"","note":"Don't delete this file! It's used internally to help with page regeneration."}

stylesheets/pygment_trac.css

@@ -1,70 +0,0 @@
-.highlight .hll { background-color: #ffffcc }
-.highlight  { background: #f0f3f3; }
-.highlight .c { color: #0099FF; font-style: italic } /* Comment */
-.highlight .err { color: #AA0000; background-color: #FFAAAA } /* Error */
-.highlight .k { color: #006699; font-weight: bold } /* Keyword */
-.highlight .o { color: #555555 } /* Operator */
-.highlight .cm { color: #0099FF; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #009999 } /* Comment.Preproc */
-.highlight .c1 { color: #0099FF; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #0099FF; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #FF0000 } /* Generic.Error */
-.highlight .gh { color: #003300; font-weight: bold } /* Generic.Heading */
-.highlight .gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */
-.highlight .go { color: #AAAAAA } /* Generic.Output */
-.highlight .gp { color: #000099; font-weight: bold } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #003300; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #99CC66 } /* Generic.Traceback */
-.highlight .kc { color: #006699; font-weight: bold } /* Keyword.Constant */
-.highlight .kd { color: #006699; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #006699; font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { color: #006699 } /* Keyword.Pseudo */
-.highlight .kr { color: #006699; font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #007788; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #FF6600 } /* Literal.Number */
-.highlight .s { color: #CC3300 } /* Literal.String */
-.highlight .na { color: #330099 } /* Name.Attribute */
-.highlight .nb { color: #336666 } /* Name.Builtin */
-.highlight .nc { color: #00AA88; font-weight: bold } /* Name.Class */
-.highlight .no { color: #336600 } /* Name.Constant */
-.highlight .nd { color: #9999FF } /* Name.Decorator */
-.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
-.highlight .ne { color: #CC0000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #CC00FF } /* Name.Function */
-.highlight .nl { color: #9999FF } /* Name.Label */
-.highlight .nn { color: #00CCFF; font-weight: bold } /* Name.Namespace */
-.highlight .nt { color: #330099; font-weight: bold } /* Name.Tag */
-.highlight .nv { color: #003333 } /* Name.Variable */
-.highlight .ow { color: #000000; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #FF6600 } /* Literal.Number.Float */
-.highlight .mh { color: #FF6600 } /* Literal.Number.Hex */
-.highlight .mi { color: #FF6600 } /* Literal.Number.Integer */
-.highlight .mo { color: #FF6600 } /* Literal.Number.Oct */
-.highlight .sb { color: #CC3300 } /* Literal.String.Backtick */
-.highlight .sc { color: #CC3300 } /* Literal.String.Char */
-.highlight .sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */
-.highlight .s2 { color: #CC3300 } /* Literal.String.Double */
-.highlight .se { color: #CC3300; font-weight: bold } /* Literal.String.Escape */
-.highlight .sh { color: #CC3300 } /* Literal.String.Heredoc */
-.highlight .si { color: #AA0000 } /* Literal.String.Interpol */
-.highlight .sx { color: #CC3300 } /* Literal.String.Other */
-.highlight .sr { color: #33AAAA } /* Literal.String.Regex */
-.highlight .s1 { color: #CC3300 } /* Literal.String.Single */
-.highlight .ss { color: #FFCC33 } /* Literal.String.Symbol */
-.highlight .bp { color: #336666 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #003333 } /* Name.Variable.Class */
-.highlight .vg { color: #003333 } /* Name.Variable.Global */
-.highlight .vi { color: #003333 } /* Name.Variable.Instance */
-.highlight .il { color: #FF6600 } /* Literal.Number.Integer.Long */
-
-.type-csharp .highlight .k { color: #0000FF }
-.type-csharp .highlight .kt { color: #0000FF }
-.type-csharp .highlight .nf { color: #000000; font-weight: normal }
-.type-csharp .highlight .nc { color: #2B91AF }
-.type-csharp .highlight .nn { color: #000000 }
-.type-csharp .highlight .s { color: #A31515 }
-.type-csharp .highlight .sc { color: #A31515 }

stylesheets/stylesheet.css

@@ -1,433 +0,0 @@
-/*******************************************************************************
-Slate Theme for GitHub Pages
-by Jason Costello, @jsncostello
-*******************************************************************************/
-
-@import url(pygment_trac.css);
-
-/*******************************************************************************
-MeyerWeb Reset
-*******************************************************************************/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font: inherit;
-  vertical-align: baseline;
-}
-
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-
-ol, ul {
-  list-style: none;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-/*******************************************************************************
-Theme Styles
-*******************************************************************************/
-
-body {
-  box-sizing: border-box;
-  color:#373737;
-  background: #212121;
-  font-size: 16px;
-  font-family: 'Myriad Pro', Calibri, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  -webkit-font-smoothing: antialiased;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  margin: 10px 0;
-  font-weight: 700;
-  color:#222222;
-  font-family: 'Lucida Grande', 'Calibri', Helvetica, Arial, sans-serif;
-  letter-spacing: -1px;
-}
-
-h1 {
-  font-size: 36px;
-  font-weight: 700;
-}
-
-h2 {
-  padding-bottom: 10px;
-  font-size: 32px;
-  background: url('../images/bg_hr.png') repeat-x bottom;
-}
-
-h3 {
-  font-size: 24px;
-}
-
-h4 {
-  font-size: 21px;
-}
-
-h5 {
-  font-size: 18px;
-}
-
-h6 {
-  font-size: 16px;
-}
-
-p {
-  margin: 10px 0 15px 0;
-}
-
-footer p {
-  color: #f2f2f2;
-}
-
-a {
-  text-decoration: none;
-  color: #007edf;
-  text-shadow: none;
-
-  transition: color 0.5s ease;
-  transition: text-shadow 0.5s ease;
-  -webkit-transition: color 0.5s ease;
-  -webkit-transition: text-shadow 0.5s ease;
-  -moz-transition: color 0.5s ease;
-  -moz-transition: text-shadow 0.5s ease;
-  -o-transition: color 0.5s ease;
-  -o-transition: text-shadow 0.5s ease;
-  -ms-transition: color 0.5s ease;
-  -ms-transition: text-shadow 0.5s ease;
-}
-
-a:hover, a:focus {text-decoration: underline;}
-
-footer a {
-  color: #F2F2F2;
-  text-decoration: underline;
-}
-
-em {
-  font-style: italic;
-}
-
-strong {
-  font-weight: bold;
-}
-
-img {
-  position: relative;
-  margin: 0 auto;
-  max-width: 739px;
-  padding: 5px;
-  margin: 10px 0 10px 0;
-  border: 1px solid #ebebeb;
-
-  box-shadow: 0 0 5px #ebebeb;
-  -webkit-box-shadow: 0 0 5px #ebebeb;
-  -moz-box-shadow: 0 0 5px #ebebeb;
-  -o-box-shadow: 0 0 5px #ebebeb;
-  -ms-box-shadow: 0 0 5px #ebebeb;
-}
-
-p img {
-  display: inline;
-  margin: 0;
-  padding: 0;
-  vertical-align: middle;
-  text-align: center;
-  border: none;
-}
-
-pre, code {
-  width: 100%;
-  color: #222;
-  background-color: #fff;
-
-  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
-  font-size: 14px;
-
-  border-radius: 2px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-}
-
-pre {
-  width: 100%;
-  padding: 10px;
-  box-shadow: 0 0 10px rgba(0,0,0,.1);
-  overflow: auto;
-}
-
-code {
-  padding: 3px;
-  margin: 0 3px;
-  box-shadow: 0 0 10px rgba(0,0,0,.1);
-}
-
-pre code {
-  display: block;
-  box-shadow: none;
-}
-
-blockquote {
-  color: #666;
-  margin-bottom: 20px;
-  padding: 0 0 0 20px;
-  border-left: 3px solid #bbb;
-}
-
-
-ul, ol, dl {
-  margin-bottom: 15px
-}
-
-ul {
-  list-style: inside;
-  padding-left: 20px;
-}
-
-ol {
-  list-style: decimal inside;
-  padding-left: 20px;
-}
-
-dl dt {
-  font-weight: bold;
-}
-
-dl dd {
-  padding-left: 20px;
-  font-style: italic;
-}
-
-dl p {
-  padding-left: 20px;
-  font-style: italic;
-}
-
-hr {
-  height: 1px;
-  margin-bottom: 5px;
-  border: none;
-  background: url('../images/bg_hr.png') repeat-x center;
-}
-
-table {
-  border: 1px solid #373737;
-  margin-bottom: 20px;
-  text-align: left;
- }
-
-th {
-  font-family: 'Lucida Grande', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  padding: 10px;
-  background: #373737;
-  color: #fff;
- }
-
-td {
-  padding: 10px;
-  border: 1px solid #373737;
- }
-
-form {
-  background: #f2f2f2;
-  padding: 20px;
-}
-
-/*******************************************************************************
-Full-Width Styles
-*******************************************************************************/
-
-.outer {
-  width: 100%;
-}
-
-.inner {
-  position: relative;
-  max-width: 640px;
-  padding: 20px 10px;
-  margin: 0 auto;
-}
-
-#forkme_banner {
-  display: block;
-  position: absolute;
-  top:0;
-  right: 10px;
-  z-index: 10;
-  padding: 10px 50px 10px 10px;
-  color: #fff;
-  background: url('../images/blacktocat.png') #0090ff no-repeat 95% 50%;
-  font-weight: 700;
-  box-shadow: 0 0 10px rgba(0,0,0,.5);
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-
-#header_wrap {
-  background: #212121;
-  background: -moz-linear-gradient(top, #373737, #212121);
-  background: -webkit-linear-gradient(top, #373737, #212121);
-  background: -ms-linear-gradient(top, #373737, #212121);
-  background: -o-linear-gradient(top, #373737, #212121);
-  background: linear-gradient(top, #373737, #212121);
-  height: 170px;
-}
-
-#header_wrap .inner {
-  padding: 50px 10px 30px 10px;
-}
-
-#project_title {
-  margin: 0;
-  color: #fff;
-  font-size: 42px;
-  font-weight: 700;
-  text-shadow: #111 0px 0px 10px;
-}
-
-#project_tagline {
-  color: #fff;
-  font-size: 24px;
-  font-weight: 300;
-  background: none;
-  text-shadow: #111 0px 0px 10px;
-}
-
-#downloads {
-  position: absolute;
-  width: 210px;
-  z-index: 10;
-  bottom: -40px;
-  right: 0;
-  height: 70px;
-  background: url('../images/icon_download.png') no-repeat 0% 90%;
-}
-
-.zip_download_link {
-  display: block;
-  float: right;
-  width: 90px;
-  height:70px;
-  text-indent: -5000px;
-  overflow: hidden;
-  background: url(../images/sprite_download.png) no-repeat bottom left;
-}
-
-.tar_download_link {
-  display: block;
-  float: right;
-  width: 90px;
-  height:70px;
-  text-indent: -5000px;
-  overflow: hidden;
-  background: url(../images/sprite_download.png) no-repeat bottom right;
-  margin-left: 10px;
-}
-
-.zip_download_link:hover {
-  background: url(../images/sprite_download.png) no-repeat top left;
-}
-
-.tar_download_link:hover {
-  background: url(../images/sprite_download.png) no-repeat top right;
-}
-
-#main_content_wrap {
-  background: #f2f2f2;
-  border-top: 1px solid #111;
-  border-bottom: 1px solid #111;
-}
-
-#main_content {
-  padding-top: 40px;
-  clear:both;
-}
-
-#footer_wrap {
-  background: #212121;
-}
-
-.logo{
-    float: left;
-    border: none;
-    box-shadow: none;
-    -webkit-box-shadow: none;
-    margin-right: 10px;
-}
-
-
-
-/*******************************************************************************
-Small Device Styles
-*******************************************************************************/
-
-@media screen and (max-width: 480px) {
-  body {
-    font-size:14px;
-  }
-
-  #downloads {
-    display: none;
-  }
-
-  .inner {
-    min-width: 320px;
-    max-width: 480px;
-  }
-
-  #project_title {
-  font-size: 32px;
-  }
-
-  h1 {
-    font-size: 28px;
-  }
-
-  h2 {
-    font-size: 24px;
-  }
-
-  h3 {
-    font-size: 21px;
-  }
-
-  h4 {
-    font-size: 18px;
-  }
-
-  h5 {
-    font-size: 14px;
-  }
-
-  h6 {
-    font-size: 12px;
-  }
-
-  code, pre {
-    min-width: 320px;
-    max-width: 480px;
-    font-size: 11px;
-  }
-
-}