Correct dependencies in composer.json
Merge branch 'dev'