Paiement P2P
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/language_fr.properties