submitting merge article form routes to proper controller method and redirects to the edit page of the current article
finished implementing merge functionality
Working on tests.
Merge remote-tracking branch 'origin/merge'

Conflicts:
	db/db_development
	features/merge_articles.feature
changed db