moved articles back into correct view
Merge branch 'recovery' into articles
added articles controller