Update composer.json
Merge branch 'origin/dev'