Merge branch 'master' of https://github.com/loomio/loomio into feature/activity-email
run migrations
Merge branch 'feature/activity-email' of https://github.com/loomio/loomio into feature/activity-email