updated composer.json
updated composer
Merge branch '1.0' into 2.0

Conflicts:
	composer.json