Merge branch 'fix-reading-club-email' into develop
Merge branch 'hotfix-niqati-cronjob' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfix-twitter-embed' into develop
Revert "Merge branch 'add-activity-even-if-not-coordinator' into develop"

This reverts commit 5cd177e65569333ac5c8c0736739c7f02212dae3, reversing
changes made to c8450aabf953dffaac60694f2398c2e10c0934e1.

Conflicts:
	activities/utils.py
Add functions to geneerate email Tos and CCs
Add deputies and change permissions accordingly.
Merge branch 'club-vices'
Make it possible for deputies to order niqati
Merge branch 'club-vices'