brought in views and controllers
Merge branch 'recovery' into articles
merging the views and controller for articles
why did the controller not copy...