Merged in from main project.

Conflicts:
	Cogito.Core/Cogito.Core.csproj
	Cogito.Core/Resources/AssemblyResource.cs
	Cogito.Core/Version.cs
	Cogito.Irony/Properties/AssemblyInfo.cs
	Cogito.Linq/Properties/AssemblyInfo.cs
	Cogito.Nancy.Razor/BuildProviders/CSharpRazorBuildProvider.cs
	Cogito.Nancy.Razor/Cogito.Nancy.Razor.csproj
	Cogito.Nancy.Razor/NancyRazorLayoutViewProvider.cs
	Cogito.Nancy.Razor/NancyRazorViewAssemblyCatalog.cs
	Cogito.Nancy.Razor/NancyRazorViewBase.cs
	Cogito.Nancy.Razor/NancyRazorViewProcessor.cs
	Cogito.Nancy.Razor/NancyRazorViewProvider.cs
	Cogito.Nancy.Razor/NancyRazorViewReflectionContext.cs
	Cogito.Nancy.Razor/UrlHelpersExtensions.cs
	Cogito.Nancy/Cogito.Nancy.csproj
	Cogito.Nancy/DefaultModelBinder.cs
	Cogito.Nancy/NancyBootstrapper.cs
	Cogito.Nancy/NegotiationResponseProcessor.cs
	Cogito.Nancy/ResourceProcessor.cs
	Cogito.Owin/Properties/AssemblyInfo.cs
	Cogito.Web.Razor.Tests/packages.config
	Cogito.sln