Payment
no message
Toscan Commit (soucis sourcetree)
no message
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/Hoper/PaymentBundle/Controller/DetailsController.php
	src/Hoper/PaymentBundle/Controller/PaymentController.php