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

Conflicts:
	.php_cs