composer.json updated
composer fix
Merge remote-tracking branch 'origin/2.2'

* origin/2.2:
  composer fix
  composer.json updated

Conflicts:
	composer.json