modified models in article and category
moved some files around
Merge branch 'recovery2' into articles
got site working by moving files around
Merge pull request #1 from mchyr/articles

article changes