ActionMailer settings
sync
cucumber scenarios for merge articles feature
merge artiles functionality
merge articles feature
fixed: merge form is shown for non-admins
fixed exception when publisher tries to merge