Fixes settings date format not visible right after install
Merge pull request #1003 from rustyswayne/1.5.2

Fixes settings date format not visible right after install
Merge branch '1.5.2' into 1.6.0
Merge remote-tracking branch 'merchello/1.6.0' into 1.6.0
Test build for 1.6.0 release
Fixed M-537 - adding new shipmethod fails
Updates attribute path value for FixedRateShippingProvider to add a shipping method
Test build for 1.5.2 release
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
Merge pull request #1004 from rustyswayne/1.6.0

Merge 1.5.2