Add ability to merge articles
Position Merge button under the Article ID textbox
Prevent anyone other than admin from seeing merge functionality
Don't just hide the merge functionality if the user is not an admin
or the article id is nil. Don't let that section be rendered at all.
return self
rename id of Article ID text field to merge_with
change attr_writer to attr_accessor for merge_with method
Move merge functionality into it's own form inside new.html.erb
Add validation to prevent non-administrators from merging articles
Fix bug where the code was checking to see if the user was an admin or not incorrectly
Replace the text_field tag for Article ID with a text_field_tag since this textbox should not be bound to a model which is what text_field is for
Add logic to content controller merge action to check if the current user is an admin or not
Don't set a default value for other article id in merge_with method(not needed since not binding to this in the view)
Update id for Article ID text field to it's correct value
Fix bug where new view did not render when Categories link was clicked in the left hand menu of the admin portal
Add ability to save edits to catgories
Split the content from new_or_edit into other methods
Update new view to display model error if name is not provided
Move content of create method back into new method and change form_for back into form_tag
Remove admin category edit view since it is not needed.  Also re-add new_or_edit method in categories_controller