fixed composer.json
fixed composer error
Merge branch 'origin/master'