Shtuff
Merge branch 'Roger'

Conflicts:
	.gitignore
	ClassProject/ClassProject.v11.suo
	ClassProject/FCTDataTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' into Roger
Package Update Issues