add composer.json
Merge branch 'master' into wip/1.0

Conflicts:
	composer.json