added composer.json
Merge branch 'master' into dev