-Added composer.json

Merge branch 'feature-composer'
Merge branch 'develop'
changes to composer.json
changes to composer.json
changes to composer.json
changes to composer.json
changes to composer.json
changes to composer.json
changes to composer.json
changes to composer.json
Merge branch 'develop'
Merge branch 'master' into develop