Support for Merchant Warrior with credit card and token payments
MerchantWarrior fixes