Adding composer.json from master