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
Added mercurys js and css to precompiled assets for production environment.
Added jquery to precompiled list for production as well.
Left the option not to force ssl in development in the environments config file for development.
Told mercury to use the sessions helpers authentication system to authenticate users.
Installed paper-trail and implemented it for articles.
Small modifications in Articles controller in passing.
Changed asset pipeline not to require the whole tree anymore.
Added simple controller and test for Versions