Add merge for articles
Cucumber features and steps for bug in creating|editing a category
Fix bug in creating|editing category