add cancan gem for roles
fixed confllict in User.rb