Merge branch 'hotfix/quick-spam-fixes'
only authenticated users can now comment
Merge branch 'hotfix/zinnia-comments'
Merge branch 'hotfix/zinnia-comments' into develop
Add appropriate rel links in header to deal with the duplicate content issue, at least for CMS pages
Merge branch 'hotfix/duplicate_content_cms' into develop
Add appropriate rel links in header to deal with the duplicate content issue, at least for CMS pages
Opportunistic optimisation:  remove memory-intensive and obsolete search-related code from context processor
Switch to our zinnia fork to get a full author list in zinnia admin untill patch is accepted upstream
Merge branch 'hotfix/blog_authors' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop