article controller and views
Merge branch 'recovery' into articles