Update composer.json
Merge remote-tracking branch 'suxxes/master'