Merge pull request #26 from mastercoin-MSC/master

Merge stuff
Merge pull request #27 from mastercoin-MSC/master

Merge stuff
Merge pull request #28 from mastercoin-MSC/master

Merge stuff
Merge pull request #29 from mastercoin-MSC/master

Merge stuff
Merge pull request #30 from mastercoin-MSC/master

Merge stuff
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