Pushing my commit for CAS

CAS should be working, once the Database conflict here is resolved...
Trying to do this
Merge branch 'master' of https://github.com/thefacegroup/Ready-Player-One-Final

Conflicts:
	TestApp/TestApp/TestApp.csproj