Changes Include:

- Fixed display of saved cards
- Replaced Laser with Maestro
- Only last four digits of saved cards now stored / displayed
- Improved Success / Failure Messages
- Updated version number
Changes Include:

- Fixed display of saved cards
- Replaced Laser with Maestro
- Only last four digits of saved cards now stored / displayed
- Improved Success / Failure Messages
- Updated version number
Merge origin/master

Conflicts:
	realexredirect/controllers/front/payment.php
	realexredirect/views/templates/front/payment_execution.tpl
	realexredirect/views/templates/hook/payment_return.tpl
Merge branch 'master' of github.com:seanmacdomhnall/PrestaShop-modules into seanmacdomhnall-master

Conflicts:
	addshoppers
	adyen
	alliance3
	authorizeaim
	avalaratax
	bluepay
	boxdropshipment
	browsi
	desjardins
	ebay
	ecopresto
	fedexcarrier
	feedaty
	ferbuy
	fianetfraud
	fianetsceau
	firstdata
	gadwords
	ganalytics
	giveit
	gointerpay
	kiala
	kialasmall
	klarnaprestashop
	kwixo
	mailjet
	merchantware
	mondialrelay
	moneybookers
	nqgatewayneteven
	ogone
	paymentsense
	prediggo
	prestafraud
	realexredirect/config.xml
	realexredirect/realexredirect.php
	sendinblue
	shopgate
	shoppingfluxexport
	simplifycommerce
	socolissimo
	sofortbanking
	syspay
	tntcarrier
	trustly
	trustpilot
	twenga
	upscarrier
	uspscarrier
	yotpo
	zingaya
// Realex Redirect: Conflict tags removed
Merge branch 'seanmacdomhnall-master' (PR #390)
Merge branch 'master' of github.com:PrestaShop/PrestaShop-modules