Added useraction.rb to model
Merge branch 'extreme'