Merge branch 'hotfix/sticky-signin-menu'
added call to header.js to base forum template (was not reached cause of sekizai)
Merge branch 'hotfix/sticky-menu-again'
Merge branch 'hotfix/sticky-menu-again' into develop
added settings and changed honeypot css style
Merge branch 'hotfix/quick-spam-fixes'
Merge branch 'hotfix/quick-spam-fixes' into develop
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'
Merge branch 'hotfix/blog_authors' into develop
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
remove from compressed js block some js script that takes project translation as argument (was resulting in cache reload for each p.sh.)+put back cssmin filter+changed css code for hidden honeypot field
Merge branch 'hotfix/compression-enhance'