Update composer.json

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'

Conflicts:
	composer.json

Signed-off-by: crynobone <crynobone@gmail.com>