copied views and controllers
Merge branch 'recovery' into articles
routes added
added a comment
merge conflict