Fixes for bugs M-316 and M-317. However, deleting an address won't work properly until the keys for addresses are unique.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge pull request #759 from cssquirrel/1.3.0

Fixes for bugs M-316 and M-317.