Merge pull request #22 from mastercoin-MSC/master

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

Merge stuff
Trade page error / doesn't display when no private key addresses
Merge pull request #612 from sagyeli/Issue_610

Issue 610