Update composer.json
Merge branch 'sonata/master'