update composer.json
Merge origin/master