Fixes path for merchant account updates
adds json tags for json encoding
Remove JSON mapping for merchant ID
fixes old reference
adds extended address to json
more annotations