Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into dev/AR-1_serialization

Conflicts:
	app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
Issue #AR-1_serialization: fix tests that were failing due to changes in line-end encodings.
Issue #AR-1_property_value_converters: switched to using Archetype's native GetValue<T> when getting property values,

- added umbracoSettings.config to the test project: conversion of decimal numbers, e.g. '12345.34' triggers
'NormalizeNumberDecimalSeparator' which in turn requires via 'DefaultShortStringHelper' that the umbracoSettings.config file is loaded. We added this to make sure tests deserializing decimal numbers pass.
Merge remote-tracking branch 'origin/dev/AR-2_property_value_converters' into dev/AR-1_serialization
Issue #AR-3_IEnumerable_support: re-factor tests, add Enumerable tests - all failing as baseline.
Issue #AR-3_IEnumerable_support: fix json for simple list model - simple list model passes
Issue #AR-3_IEnumerable_support: add IEnumerable serialization support - Captions serialization tests passing.

- needs cleaning up.
Issue #AR-3_IEnumerable_support: add IEnumerable deserialization - tests pass.

However, some regression errors in compex model use case
Issue #AR-3_IEnumerable_support: all tests passing - but branching logic is difficult.
Issue #AR-3_IEnumerable_support: apply naming convention to unit tests
Issue #AR-3_IEnumerable_support: add missing tests
Issue #AR-3_IEnumerable_support: move complex model tests to sub-folder
Issue #AR-3_IEnumerable_support: clean-up
Issue #AR-3_IEnumerable_support: start on regression tests.
Issue #AR-3_IEnumerable_support: regression testing - fixes to [AsFieldset] handling,

- use ExpandoObject for all dynamically generated models
- add additional JToken parsers
- To Do: deal with multiple item fieldset
Issue #AR-3_IEnumerable_support: regression testing - fixed issue where the default fieldset name was not assigned properly during dynamic model generation
Issue #AR-3_IEnumerable_support: re-factor regression  tests
Issue #AR-3_IEnumerable_support: added compound model regression tests
Issue #AR-3_IEnumerable_support: fix issue with property extraction