edited article and category models
transferred views and stuff
Merge branch 'articles' into recovery