update composer.json
update composer.json
Merge branch 'develop'