Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Symfony/src/Acme/PlanngoBundle/Resources/views/Refund/refund.html.twig