diff --git a/.gitignore b/.gitignore
index cd628f1a..646c93b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,7 @@
TestResults/
AppPackages/
*.suo
-*.user
\ No newline at end of file
+*.user
+_ReSharper.*
+*.ReSharper.user
+*.resharper.user
\ No newline at end of file
diff --git a/Doc/ConditionalProperties.aml b/Doc/ConditionalProperties.aml
new file mode 100644
index 00000000..ba904a51
--- /dev/null
+++ b/Doc/ConditionalProperties.aml
@@ -0,0 +1,41 @@
+
+
+
+
+ Json.NET has the ability to conditionally serialize properties by placing a ShouldSerialize method on a class.
+ This funtionality is similar to the
+XmlSerializer ShouldSerialize feature
+http://msdn.microsoft.com/en-us/library/53b8022e.aspx
+_blank
+.
+
+
+ ShouldSerialize
+
+ To conditionally serialize a property add a boolean method with the same name as the property and then prefixed the method name
+ with ShouldSerialize. The result of the method determines whether the property is serialized. If the method returns true then the
+ property will be serialized, if it returns false and the property will be skipped.
+
+
+
+
+
+ Json.NET
+ DataContractJsonSerializer
+ JavaScriptSerializer
+
+
+
+ Supports JSON
+ 
+
+
+
+
+ Supports BSON
+
+ 
+
+
+
+ Supports JSON Schema
+
+
+
+
+
+ Supports .NET 2.0
+
+
+
+
+
+ Supports .NET 3.5
+
+
+
+
+
+ Supports .NET 4.0
+
+
+
+
+
+ Supports Silverlight
+
+
+
+
+
+ Supports Windows Phone
+
+
+
+
+
+ Supports WinRT
+
+
+
+
+
+ Open Source
+
+
+
+
+
+ MIT License
+
+
+
+
+
+ LINQ to JSON
+
+
+
+
+
+ Thread Safe
+
+
+
+
+
+ XPath-like JSON query syntax
+
+
+
+
+
+ Indented JSON support
+
+
+
+
+
+
+
+ Efficient dictionary serialization
+ http://stackoverflow.com/questions/1207731/how-can-i-deserialize-json-to-a-simple-dictionarystring-string-in-asp-net
+ _blank
+
+
+
+
+
+
+
+
+
+ Nonsensical dictionary serialization
+ http://stackoverflow.com/questions/4559991/any-way-to-make-datacontractjsonserializer-serialize-dictionaries-properly
+ _blank
+
+
+
+
+
+
+
+ Deserializes IList, IEnumerable, ICollection, IDictionary properties
+
+
+
+
+
+ Serializes circular references
+
+
+
+
+
+ Supports serializing objects by reference
+
+
+
+
+
+ Deserializes polymorphic properties and collections
+
+
+
+
+
+ Serializes and deserializes multidimensional arrays
+
+
+
+
+
+ Supports including type names with JSON
+
+
+
+
+
+ Globally customize serialization process
+
+
+
+
+
+ Supports excluding null values when serializing
+
+
+
+
+
+ Supports SerializationBinder
+
+
+
+
+
+ Conditional property serialization
+
+
+
+
+
+ Includes line number information in errors
+
+
+
+
+
+ Converts XML to JSON and JSON to XML
+
+
+
+
+
+ JSON Schema validation
+
+
+
+
+
+ JSON Schema generation from .NET types
+
+
+
+
+
+ Camel case JSON property names
+
+
+
+
+
+ Non-default constructors support
+
+
+
+
+
+ Serialization error handling
+
+
+
+
+
+ Supports populating an existing object
+
+
+
+
+
+ Efficiently serializes byte arrays as base64 text
+
+
+
+
+
+ Handles NaN, Infinity, -Infinity and undefined
+
+
+
+
+
+ Handles JavaScript constructors
+
+
+
+
+
+ Serializes .NET 4.0 dynamic objects
+
+
+
+
+
+ Serializes ISerializable objects
+
+
+
+
+
+ Supports serializing enums to their text name
+
+
+
+
+
+ JSON recursion limit support
+
+
+
+
+
+ Attribute property name customization
+
+
+
+
+
+ Attribute property order customization
+
+
+
+
+
+ Attribute property required customization
+
+
+
+
+
+ Supports ISO8601 dates
+
+
+
+
+
+ Supports JavaScript constructor dates
+
+
+
+
+
+ Supports Microsoft AJAX dates
+
+
+
+
+
+ Unquoted property names support
+
+
+
+
+
+ Raw JSON support
+
+
+
+
+
+ Supports reading and writing comments
+
+
+
+
+
+ Serializes anonymous types
+
+
+
+
+
+ Deserializes anonymous types
+
+
+
+
+
+ Opt-in mode serialization
+
+
+
+
+
+ Opt-out mode serialization
+
+
+
+
+
+ Field (Serializable) mode serialization
+
+
+
+
+
+ Efficiently stream reading and writing JSON
+
+
+
+
+
+ Single or double quote JSON content
+
+
+
+
+
+ Supports overriding a type's serialization
+
+
+
+
+
+ Supports OnDeserialized, OnSerializing, OnSerialized and OnDeserializing attributes
+
+
+
+
+
+ Supports serializing private properties
+
+
+
+
+
+ DataMember attribute support
+
+
+
+
+
+ MetdataType attribute support
+
+
+
+
+
+ DefaultValue attribute support
+
+
+
+
+
+ Serializes DataSets and DataTables
+
+
+
+
+
+ Serailizes Entity Framework
+
+
+
+
+
+ Serializes nHibernate
+
+
+
+
+
+ Case-insensitive property deserialization
+
+
+
+
+
+
+
+
+ Benchmarks
+
+
+
+
+ Json.NET Performance
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Doc/JsonNetVsWindowsDataJson.aml b/Doc/JsonNetVsWindowsDataJson.aml
new file mode 100644
index 00000000..33e0a5ea
--- /dev/null
+++ b/Doc/JsonNetVsWindowsDataJson.aml
@@ -0,0 +1,101 @@
+
+
+
+
+ Windows 8 introduces a new way to work with JSON via the
+Windows.Data.Json
+http://msdn.microsoft.com/en-us/library/windows/apps/xaml/br240639.aspx
+_blank
+ namespace. Similar to LINQ to JSON in Json.NET
+ it defines classes that can be used to parse values, strings, objects, and arrays from
+ JSON text or serialize value types into JSON text.
+ Below is a comparison of Json.NET's LINQ to JSON to Window 8's Windows.Data.Json.
+
+
+ Exclusive Json.NET Features
+
+
+
+
+ Runs on .NET 2, .NET 3, .NET 4, Silverlight and Windows Phone 7
+
+
+
+
+ Supports dynamic programming
+
+
+
+
+ Write indented JSON
+
+
+
+
+ Customize reading and writing JSON with JsonConverters
+
+
+
+
+ Read and write ISO8601 dates
+
+
+
+
+ Better LINQ support
+
+
+
+
+
+
+ Creating JSON
+
+ The big difference between the two libraries when creating JSON is Windows.Data.Json requires
+ string/integer/double values to be explicitly converted to JsonValue objects.
+ Note that there is a weird limitation to creating JSON with Windows.Data.Json: it doesn't
+ allow you to set properties to null or put null values in an array.
+
+