Merge pull request #4597 from makeen/fixEditButtonAddressContact

fix button "Edit" encode url in address and contact template