run php-cs-fixer again on master
Merge branch 'master' into seo-presentation-fix

Conflicts:
	DependencyInjection/CmfSeoExtension.php
	EventListener/SeoContentListener.php
	Model/SeoPresentation.php
php-cs-fixer run on this branch
correct config