added original views and controllers
Merge branch 'recovery' into articles
"merging articles"
changed articles controller
articles controller