more about checkout process
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-resources/src/main/resources/themes/default/plugins/qalingo-plugin.form-cart.js