Merge branch 'Ian'

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/bin/ClassProject.dll
	ClassProject/ClassProject/bin/ClassProject.pdb
	ClassProject/ClassProject/bin/FCTDataModel.dll
	ClassProject/ClassProject/bin/FCTDataModel.pdb
	ClassProject/ClassProject/obj/Debug/ClassProject.csproj.FileListAbsolute.txt
	ClassProject/FCTDataTests/bin/Debug/FCTDataModel.dll
	ClassProject/FCTDataTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ClassProject/FCTDataTests/obj/Debug/FCTDataTests.csproj.FileListAbsolute.txt