changes made
added controlers
Merge branch 'recovery'
modified routes