updated tpl and added migration for disable_token field
Merge remote-tracking branch 'upstream/develop' into feature/CLUB-588
added link
Update requirements.txt
mail server add
Merge pull request #1381 from onepercentclub/feature/dev-update

mail server add
Fix signin link style
Merge pull request #1382 from FransTwisk/CLUB-561---Fix-sign-in-link-style

Fix signin link style
Update activation_email.html
Merge pull request #1380 from onepercentclub/feature/CLUB-588

Feature/club 588
Fix campaign start page + moved btn styles
Merge pull request #1384 from FransTwisk/CLUB-669---Campaign-Start-Buttons

Fix campaign start page + moved btn styles
Merge remote-tracking branch 'origin/develop' into feature/user-flow-tests

Conflicts:
	requirements/requirements.txt