Add Cfk header
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Add Cfk header
Fix cfk-header for smaller screens
Add expire date too cfk-header cookie
Fix reapearing cookie after red notice
add reindex button to article admin interface - fix #576
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
HOTFIX IN PROGRESS - temporarily add logger
HOTFIX IN PROGRESS - expand logger
Minor cleanup
Fix merge conflicts
Fix more merge conflicts
One merge conflict at a time...
HOTFIX #718 finished, removing loggers
Merge branch 'master' into develop
Update README.rdoc
HOTFIX - add link to christmas calendar
counter caching categories + dont show empty #711
delayed jobs hotfix