Name adjustments
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
Merge branch 'master' into Roger
Package Update Issues
Shtuff
Merge branch 'Roger'
Added user profile system. TODO added authenthication check before page load
Added user authentication
Merge branch 'Roger'
Trying to get published
shtuff
fff
Merge branch 'Roger'

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/bin/ClassProject.dll
Merge branch 'master' into Riven

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