Merchant object update

Merchant object change ported over from XML to JSON branch.