Recovered views and controller of article
Merge branch 'recovery' into articles