Merge pull request #220 from xithan/develop

wagn 1.14 - a few more tests and we are ready to go
added follow specs
turned off html diff
removed 'save_draft' controller action
added diff for conflicts
fixed view logger
using CSV gem for logging
fixed image history bug
first approach to interrupted action
removed "cards" after cardname in notification message
Merge remote-tracking branch 'xithan/follow_specs' into wikirate
Merge remote-tracking branch 'wagn/develop' into develop
added cuke for edit conflicts
added failing conflict cuke
replaced ruby2.1 methods with 1.9 compatible versions
typo
little corrections
Merge pull request #223 from xithan/follow_specs

I merge this to fix wikirate.
no file request logging
card migration for decks