Corrected composer.json.
Merge branch 'development'

Conflicts:
	CHANGELOG.md