modified article, category models
updated controller
Merge branch 'recovery2' into articles
updated routes.rb
Merge pull request #1 from rebachen/articles

modified article, category models