composer.json
Merge branch 'master' of https://github.com/colibri-fw/config
composer.json fix