adds composer.json
Merge branch 'master' into ui
mergin