added edit ArticleContent with revisions
Merge conflict. meh