1.5.2 release build
Merge branch '1.5.2' into 1.6.0

Conflicts:
	build/Merchello.Version.props
	build/NuSpec/Merchello.Core.nuspec
	build/NuSpec/Merchello.TestsBase.nuspec
	src/Merchello.Core/Configuration/MerchelloVersion.cs
	src/Merchello.Core/Properties/AssemblyInfo.cs
	src/Merchello.Web/Properties/AssemblyInfo.cs