fixed composer.json
fixed composer.json
updated parameters file
updated updated parameters file
Merge branch 'origin/2.3'

Conflicts:
	composer.json