Corrected errors in composer.json
Merge branch 'master' into feature/optional_quick_create

Conflicts:
	composer.json