Merge branch 'master' into notifier-integration
Merge branch 'notifier-integration' of github.com:DemocracyOS/app into notifier-integration