Tweaked composer.json
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	composer.json