working pre-refactored article_merging_spec and merge_with
refactored article_merging_spec
added merge route, moded _edit with merge form, feature steps
working merge cuke scenario
added merge sad paths into features and content_controller
clean up merge
moved merge form to partial, made conditional on user role
beginning of non-admin scenarios