Fix composer.json
Merge branch 'develop'