Merge origin/master

Conflicts:
	src/ipezbo/NewsletterBundle/Resources/views/Newsletter/index.html.twig