Merge branch 'master' into Roger
Merged master back into my branch
modified gitignore
Added data integrity checks to controllers and updated packages libraries
Shtuff
Merge branch 'Roger'

Conflicts:
	.gitignore
	ClassProject/ClassProject.v11.suo
	ClassProject/FCTDataTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache