updated views for articles, feeds, categories. Added table for categories/feeds
fixed conflicts