More view updates
Merge branch 'cleanup' of https://github.com/juliussss/prototype2 into cleanup

Conflicts:
	MvcApplication4/Controllers/UserController.cs
	MvcApplication4/ViewModels/UserProfileViewModel.cs
	MvcApplication4/Views/Shared/_LoginPartial.cshtml
	MvcApplication4/Views/User/Profile.cshtml
	MvcApplication4/Web.config