bugfix: Bottom button should match the offer call to action
bugfix: Bottom button should match the offer call to action
Merge branch 'master' of https://github.com/ftwgroup/repertoire

Conflicts:
	faucet/templates/faucet/email_template_rendered.html
modifications so that we can mailchimp format contact lists into or contacts database
frontend for sending emails works. Backend steal needs a few tweaks.
Merge branch 'master' into load-custom-templates
merge