Merge branch 'master' of https://github.com/ProgrammerPig/tfs

Conflicts:
	ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.dll
	ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.pdb

	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csproj.FileListAbsolute.txt

	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csprojResolveAssemblyReference.cache
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.dll
	ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.pdb
	ProgrammerPigLibrary/whUmbracoBase/packages.config
	midana/midana.v11.suo
	midana/midana/bin/whUmbracoBase.dll