fixed composer.json
no message
Merge branch 'composer_fix'

Conflicts:
	composer.json