Merging form and controller modification for merging functionality
missed cucumber feature file from last commit
article merging functionatility works with article body
fixed single quotes to duoble quotes
merging now also comments
fixed bug in category creation