Merged the master development channel into the production channel as v2.0.0
Bump version numbers
Merge branch 'release-2.1.0' into production
Bump version numbers
Merge branch 'release-2.1.1' into production

Conflicts:
	CSF Software.sln
	CSF.Data.NHibernate/CSF.Data.NHibernate.csproj
	CSF.KeyValueSerializer/CSF.KeyValueSerializer.csproj
	CSF.Testing.Mocks/CSF.Testing.Mocks.csproj
	CSF.Testing/CSF.Testing.csproj
	CSF.Web.Mvc/CSF.Web.Mvc.csproj
	CSF/CSF.csproj
	Common/CommonAssemblyInfo.cs
	Test.CSF/Test.CSF.csproj
Merge branch 'production'