update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Collinson.Web.Tests/bin/Debug/Collinson.Web.Tests.dll
	Collinson.Web.Tests/bin/Debug/Collinson.Web.Tests.pdb
	Collinson.Web.Tests/bin/Debug/Collinson.Web.dll
	Collinson.Web.Tests/bin/Debug/Collinson.Web.pdb

	Collinson.Web.Tests/obj/Debug/Collinson.Web.Tests.csprojResolveAssemblyReference.cache
	Collinson.Web.Tests/obj/Debug/Collinson.Web.Tests.dll
	Collinson.Web.Tests/obj/Debug/Collinson.Web.Tests.pdb