views and controllers for articles now present and in proper locations
Merge branch 'recovery' into articles
random crap fixed