Change delete confirmation for watchonly/private key addresses
Merge pull request #758 from achamely/master

Change delete confirmation for watchonly/private key addresses
Bug fix: a private key address in wallet becomes watch-only when added as watch-only
Merge pull request #763 from sagyeli/Issue_679

Prevent import of watch address when private key already exists
Merge pull request #31 from mastercoin-MSC/master

Merge stuff