Fixed unit test
Merge branch 'master' of github.com:TeamMentor/Dev into 352_TBot-Password
User.cshtml being cached.