simplified content setting
Merge pull request #2 from ethn/wikirate

simplified content setting
Merge pull request #221 from xithan/wikirate

update wikirate to current develop
isolated migration changes for wikirate update
Merge remote-tracking branch 'upstream/wikirate' into wikirate
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
Merge remote-tracking branch 'wagn/develop' into develop