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

Conflicts:
	composer.json