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