Create composer.json
Add composer.json
Add composer.json
Create composer.json
Merge remote-tracking branch 'vinai-drive-by-commits/master'
Merge remote-tracking branch 'bragento/master'

Conflicts:
	composer.json
Merge remote-tracking branch 'nfabre/master'

Conflicts:
	composer.json