fixed some mvc issues
Merge branch 'recovery' into articles