project creation work
updating composer.json
Merge branch 'master' into create-project

Conflicts:
	composer.json