Merge pull request #1 from mastercoin-MSC/master

Getting latest changes
removed protocol, propertyid from AddressesInWallets
Merge pull request #22 from marv-engine/fix_AddressBalances

Fix AddressesInWallets