added controllers and views
Merge branch 'recovery' into articles
errors?