email
Merge branch 'master' of https://github.com/JulesMarcil/twinkler

Conflicts:
	app/Resources/views/emails/template.email.twig