transaction
transaction
Merge branch 'master' of https://github.com/michelre/aerodrome-client

Conflicts:
	web/fr/pilot/js/payment-viewmodel.js
payment