Merge remote-tracking branch 'origin/feature/mpgs-hosted-session' into feature/mpgs-direct

# Conflicts:
#	apps/payment_gateway_app/lib/payment_gateway_app_web/controllers/mastercard_html.ex
