user.rb modification
Merge branch 'admin_set'