Modified composer.json.
Merge branch 'master' of https://github.com/daniel-melzer/teacup-json

Conflicts:
	composer.json