modify composer.json
Merge branch 'develop'
modify composer.json