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

Conflicts:
	.php_cs
Updated dependencies
CS fixes