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

Conflicts:
	.php_cs
CS fixes