modified:   app/controllers/admin/categories_controller.rb
	modified:   app/controllers/admin/content_controller.rb
	modified:   app/models/article.rb
	modified:   app/models/text_filter.rb
	modified:   app/views/admin/shared/_edit.html.erb
	new file:   features/categories.feature
	new file:   features/merge_articles.feature
	new file:   features/step_definitions/article_steps.rb
	modified:   features/support/paths.rb
	new file:   typo.ans