Moved views and controllers over
Merge branch 'recovery' into articles
Added articles controller