change in user.rb & user_spec.rb
Merge branch 'master' of https://github.com/StrataLabs/service_desk