Changed The Model to have UserProfile referenced as User to avoid conflicts with accountModel class of UserProfile. fixed references to named properties of Username => UserName of the New User Class.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/CardShop.csproj
	CardShop/CardShop/Views/Shared/_Layout.cshtml
	CardShop/CardShop/Web.config
Merge branch 'master' of https://github.com/egreene/PracticeGDVP