composer fix
Merge branch 'master' of github.com:davidsielert/VespolinaPaymentStripeBundle

Conflicts:
	composer.json