Merge branch 'pb_paiement'

Conflicts:
	Header.html