Added composer.json thanks to @deweller
Composer.json fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.json