updated controller
Merge branch 'recovery2' into articles
updated routes.rb