Separated principal and address into a new class.Changed custom object,
mappings page, get litle mid form to show new fields.
Added merchant user name, password in mappings page.