Transferred articles views and controller to proper folders
Merge branch 'recovery' into articles
Why is articles controller not mergin?
Merge branch 'recovery' into articles
Cleaned up some merge errors