Merge pull request #30 from BitShares/master

Merge from Remote:BitShares
fix wallet delegate count
Merge pull request #31 from cgafeng/patch_fix_wallet_delegate_count

Patch fix wallet delegate count