Merge
Merge
Merge branch 'master' of ssh://git@github.com/Jane2020/proyect.git

Conflicts:
	src/Payment/ApplicationBundle/Controller/DefaultController.php
	src/Payment/ApplicationBundle/Resources/config/routing.yml