transfered controllers into the right places
Merge branch 'recovery' into articles
merging recovery
added resources :articles to routes