made controllers and views
Merge branch 'recovery1' into article
fixed routes