Merge branch 'hotfix/fix_1365'
Preventive fix for userena email template
Use a local repository for django-userena to fix https://app.getsentry.com/imaginationforpeople/imaginationforpeople/group/3459594/, until https://github.com/bread-and-pepper/django-userena/pull/282 is accepted
https://github.com/CommOnEcoute/cmsplugin_facebook/pull/1 was accepted, go back to upstream version of cmsplugin-facebook
Fix #1388: blog homepage blocks layout
Merge branch 'hotfix/misc_fixes' into develop