Added mercury and simple markup for editable content in articles.
Added link to editor for articles to pages displayed to signed users.
Added controller action for article updates by mercury.
locked current version of mercury in gemfile
Told mercury to use its own action inside the articles controller instead of generic update
Refactored tests for categories pages.
Changed Guardfile to stop guard looking for spec/routing.
Changed link to create articles to have category id as parameter.
Cahnged Article creation link only to be visible by signed in users.
Implemented creation of new articles by redirection to editor.
Switched to rails 3.2.10 to prevent potential security issue in 3.2.8
Merge branch 'master' into mercury-switch-after-revert