fixing the coding style with php-cs-fixer
Merge branch 'master' into cs-fix

Conflicts:
	src/Sculpin/Bundle/ContentTypesBundle/DependencyInjection/SculpinContentTypesExtension.php
merging with master