modified:   app/views/admin/content/_form.html.erb
	new file:   features/merge_article.feature
	new file:   features/merge_article_non_admin.feature
	new file:   features/step_definitions/merge_steps.rb
	modified:   app/controllers/admin/content_controller.rb
	modified:   app/controllers/admin/content_controller.rb