Newsletter templating
Merge branch 'dev' of https://github.com/FlipFlopWeekly/FlipFlop.git
into dev

Conflicts:
	src/FlipFlop/NewsletterBundle/Controller/DefaultController.php
	src/FlipFlop/NewsletterBundle/Controller/ServiceController.php
Update parameters