-Added composer.json

Merge branch 'feature-composer' into develop
modified composer.json
Merge branch 'develop'