some BR-scrutinizer bugfixes
correcting my mistakes
updated promotion mail functionality
Some more BR-scrutinizer fixes
Merge branch 'master' into dev-form

Conflicts:
	module/MailBundle/Controller/Admin/PromotionController.php
	module/MailBundle/Form/Admin/Promotion/Mail.php