Updated User Model and Test
Merge branch 'master' of https://github.com/codeisanartform/socialfishingapp