Yep
Merge branch 'master' into Ian

Conflicts:
	ClassProject/ClassProject/bin/ClassProject.dll
	ClassProject/ClassProject/bin/FCTDataModel.dll
	ClassProject/ClassProject/obj/Debug/ClassProject.csproj.FileListAbsolute.txt
	ClassProject/FCTDataTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Edited names on pages and corrected bug checking in books on instructer page