Fix 598
crowdfunding teaser in e-mails for #677
Add Cfk header
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
add reindex button to article admin interface - fix #576
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Minor cleanup
Fix merge conflicts
Fix more merge conflicts
One merge conflict at a time...
Merge branch 'master' into develop
Update README.rdoc
counter caching categories + dont show empty #711
Merge branch 'master' into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
cache counter initializer
travix fix
prevent queues from quickly running out of items - fixes #712
Merge branch 'feature-endless-queues' into develop
Gemfile changes