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