update composer.json
Update composer.json
Fix validation
Merge branch 'origin/2.2'
Merge branch 'sonata/master'

Conflicts:
	composer.json
Merge branch 'origin/master'