Fixed php-cs-fixer config
Merge remote-tracking branch 'origin/2.1'

Conflicts:
	.php_cs