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
Merge remote-tracking branch 'xithan/follow_specs' into wikirate